diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml
index 36908d97d06385..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:24
+            image: ghcr.io/project-chip/chip-build:26
 
         steps:
             - name: Checkout
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1fdec87ac8a696..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:24
+            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:24
+            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:24
+            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:24
+            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:24
+            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 e1de11ca0becb1..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:24
+            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:24
+            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:24
+            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:24
+            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 5338ed27e4c2fe..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:24
+        #             image: ghcr.io/project-chip/chip-build-cirque:26
         #             volumes:
         #                 - "/tmp:/tmp"
         #                 - "/dev/pts:/dev/pts"
diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml
index 04648f4da135ee..50ab4e0142eed5 100644
--- a/.github/workflows/darwin.yaml
+++ b/.github/workflows/darwin.yaml
@@ -113,8 +113,6 @@ jobs:
                   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 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_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_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 0480d013741b85..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:24
+            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 95ed4e23999c76..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:24
+            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 93c26450b01c85..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:24
+            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 e0aa45bf677c50..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:24
+      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 ea90b8729766f9..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:24
+            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 f45559e5d173f2..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:24
+            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 c4d29e501a62c7..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:24
+      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 111c28ccfd2d10..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:24
+            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:24
+            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 f225a4fba5867f..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:24
+            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 58e366b6cfeca5..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:24
+            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 f0f62060f0930e..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:24
+            image: ghcr.io/project-chip/chip-build-crosscompile:26
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml
index d64409d1146a66..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:24
+            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 98061009dc4fd9..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:24
+            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 9863d8f3f89703..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:24
+            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 233a6f4fe9d540..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:24
+            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 3c22eaa79a0825..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:24
+            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 5dc15c4ca2ec62..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:24
+            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 0f950134d2ff45..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:24
+            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 8f59b06aa50e4e..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:24
+            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 994d6b5d78a325..4af591a58c91f0 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:24
+            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
@@ -220,25 +223,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 f01153240ffac6..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:24
+            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 20ba8990ed93f0..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:24
+            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 adbe225b88fe4c..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:24
+            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 9cd1dea0447d04..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:24
+            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..ba8d242d6552ea 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.3
         # 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 9db99f6461f459..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:24
+            image: ghcr.io/project-chip/chip-build:26
 
         steps:
             - name: Checkout
@@ -99,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 ff520e9e308fca..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:24
+            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 6a61aa520f6ce4..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:24
+            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:24
+            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 dbe98f9666f6a6..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:24
+            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:24
+            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 2ff570884f3a1c..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:24
+            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 d610edef1dc623..74ae921d929a54 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:24
+            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"
 
@@ -144,6 +144,7 @@ jobs:
                       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-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 \
@@ -169,6 +170,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 \
@@ -196,6 +198,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 \
                      "
@@ -215,6 +218,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
@@ -253,6 +257,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'
@@ -269,6 +274,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
@@ -334,6 +340,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 \
                      "
@@ -354,6 +361,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
@@ -404,7 +412,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:24
+            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"
 
@@ -430,6 +438,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 \
@@ -448,6 +457,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"'
@@ -461,7 +471,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 e3c39f21438aec..0896aa4ff3a75e 100644
--- a/.github/workflows/unit_integration_test.yaml
+++ b/.github/workflows/unit_integration_test.yaml
@@ -37,7 +37,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:24
+            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"
diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml
index 68b8782f576a43..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:24
+            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 bf1e305c4c9d51..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:24
+            image: ghcr.io/project-chip/chip-build:26
         defaults:
             run:
                 shell: sh
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 43a766b7dbf8dd..b73398bca4c2bf 100644
--- a/config/esp32/components/chip/Kconfig
+++ b/config/esp32/components/chip/Kconfig
@@ -640,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/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/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/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/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/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/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/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 d114fd3ddcace3..03c3b85baa2427 100644
--- a/data_model/spec_sha
+++ b/data_model/spec_sha
@@ -1 +1 @@
-17cfdc4a04397eec62f1bce7984cace268b28ab3
+49003c1b2337aa51dad227977981b763667d1f75
diff --git a/docs/ci-cd/index.md b/docs/ci-cd/index.md
index 616c34ece1d43e..de54e466d8ce94 100644
--- a/docs/ci-cd/index.md
+++ b/docs/ci-cd/index.md
@@ -1,43 +1,26 @@
 # CI/CD Documentation
 
+```{toctree}
+:glob:
+
+tools/*
+```
+
 ## 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
-
-#### 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.
-
-#### Improvement Ideas
-
--   Keep fail signature list updated to track causes of all common fails
--   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
+-   [Daily Fail Summary](tools/daily_fail_summary.md)
 
 ## 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/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
index 138e828cab9564..99693cb41a99b2 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
@@ -231,6 +231,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;
@@ -428,13 +430,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 {
@@ -483,6 +485,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -499,11 +502,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 +556,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 +593,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 {
@@ -1812,8 +1823,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 {
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 62293622ef43db..1f0867d7757cbb 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,
@@ -6886,7 +6918,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "temperature",
+              "type": "int16u",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -7559,5 +7591,6 @@
       "endpointId": 4,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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 4ee5d80575496f..c0c1236fa44335 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
@@ -225,6 +225,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;
@@ -422,13 +424,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 {
@@ -477,6 +479,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -493,11 +496,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 +550,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 +587,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 {
@@ -1822,8 +1833,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 {
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 55241805cf8a25..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,
@@ -1832,7 +1864,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1848,7 +1880,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1864,7 +1896,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2660,7 +2692,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
diff --git a/examples/air-quality-sensor-app/linux/README.md b/examples/air-quality-sensor-app/linux/README.md
index 51798c23ef441f..110c1fed58cd01 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 191a87a0088dc2..3a6187874db2b0 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
@@ -143,14 +143,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;
+  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;
@@ -436,12 +441,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -452,7 +457,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -464,7 +469,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;
@@ -481,55 +486,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;
@@ -845,6 +850,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;
@@ -1072,7 +1079,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;
@@ -1364,13 +1371,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 {
@@ -1419,6 +1426,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1435,11 +1443,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 {
@@ -1486,6 +1497,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 {
@@ -1520,6 +1534,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 {
@@ -2467,74 +2483,6 @@ 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 {
   bitmap Feature : bitmap32 {
@@ -3764,9 +3712,28 @@ 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;
+  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;
@@ -4768,7 +4735,7 @@ 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;
+  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;
@@ -5260,12 +5227,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 {
@@ -5647,25 +5616,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;
@@ -5727,19 +5677,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;
@@ -6811,19 +6757,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 7984e376753968..5f391a52fa267a 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,
@@ -3294,7 +3326,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3310,7 +3342,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3326,7 +3358,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4122,7 +4154,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -5835,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,
@@ -6814,76 +6626,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,
@@ -6927,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,
@@ -7016,7 +6764,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -7609,7 +7357,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -13253,7 +13001,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "TemperatureDisplayModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -13269,7 +13017,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "KeypadLockoutEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -13285,7 +13033,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "ScheduleProgrammingVisibilityEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -14856,7 +14604,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "temperature",
+              "type": "int16u",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -20406,76 +20154,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,
@@ -20519,16 +20203,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,
@@ -20608,7 +20292,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -21902,4 +21586,6 @@
       "networkId": 0
     }
   ]
-}
\ No newline at end of file
+}
+
+
diff --git a/examples/all-clusters-app/ameba/README.md b/examples/all-clusters-app/ameba/README.md
index 139512593a0fef..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:24
+          $ 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:24
+          $ 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/linux/BUILD.gn b/examples/all-clusters-app/linux/BUILD.gn
index e41cb9843c42c7..215f79f7540241 100644
--- a/examples/all-clusters-app/linux/BUILD.gn
+++ b/examples/all-clusters-app/linux/BUILD.gn
@@ -48,9 +48,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..b477555a3643c3 100644
--- a/examples/all-clusters-app/linux/main-common.cpp
+++ b/examples/all-clusters-app/linux/main-common.cpp
@@ -27,6 +27,7 @@
 #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 +47,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 +214,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));
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/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 d4c6725bd0f594..cbb1b7efd20700 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
@@ -143,14 +143,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;
+  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;
@@ -309,12 +314,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -325,14 +330,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;
@@ -345,55 +350,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;
@@ -686,6 +691,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;
@@ -1188,13 +1195,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 {
@@ -1243,6 +1250,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1259,11 +1267,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 {
@@ -1310,6 +1321,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 {
@@ -1344,6 +1358,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 {
@@ -2907,8 +2923,27 @@ 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;
+  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;
@@ -3193,7 +3228,7 @@ 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 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -3201,7 +3236,7 @@ server cluster TargetNavigator = 1285 {
 
   struct TargetInfoStruct {
     int8u identifier = 0;
-    char_string<32> name = 1;
+    char_string name = 1;
   }
 
   readonly attribute TargetInfoStruct targetList[] = 0;
@@ -3218,7 +3253,7 @@ server cluster TargetNavigator = 1285 {
   }
 
   response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -3420,7 +3455,7 @@ server cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : enum8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
@@ -3444,7 +3479,7 @@ server cluster KeypadInput = 1289 {
   }
 
   response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
+    StatusEnum status = 0;
   }
 
   command SendKey(SendKeyRequest): SendKeyResponse = 0;
@@ -3452,12 +3487,6 @@ 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;
-  }
-
   enum MetricTypeEnum : enum8 {
     kPixels = 0;
     kPercentage = 1;
@@ -3480,12 +3509,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;
   }
@@ -3497,13 +3532,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;
   }
 
@@ -3512,13 +3547,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;
@@ -4078,12 +4113,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 {
@@ -4392,19 +4429,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 nameSupport default = 0x80;
+    callback attribute lastConfiguredBy;
+    callback attribute sceneTableSize default = 16;
+    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;
@@ -4956,18 +4989,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 nameSupport default = 0x80;
+    callback attribute sceneTableSize default = 16;
+    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 5fdadf6b7ec4d3..43de928aba7937 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,
@@ -2748,7 +2780,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2764,7 +2796,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2780,7 +2812,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2856,7 +2888,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -4633,78 +4665,14 @@
             }
           ],
           "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",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x80",
@@ -4720,7 +4688,7 @@
               "side": "server",
               "type": "node_id",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -4736,7 +4704,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "16",
@@ -4746,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,
@@ -4835,7 +4803,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -5206,7 +5174,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -7096,7 +7064,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "TemperatureDisplayModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -7112,7 +7080,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "KeypadLockoutEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -10933,78 +10901,14 @@
             }
           ],
           "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",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x80",
@@ -11020,7 +10924,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "16",
@@ -11030,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,
@@ -11119,7 +11023,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -12349,4 +12253,6 @@
       "networkId": 0
     }
   ]
-}
\ 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 1583fe5fccea87..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:24
+          $ 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:24
+          $ docker run -it -v ${CHIP_DIR}:/root/chip ghcr.io/project-chip/chip-build-ameba:26
           ```
 
 -   Setup build environment:
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/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index 1480e89216c583..8d49b997c2b5ce 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -95,12 +95,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -111,7 +111,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -123,7 +123,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;
@@ -140,55 +140,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;
@@ -569,6 +569,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;
@@ -647,7 +649,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;
@@ -696,13 +698,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 {
@@ -751,6 +753,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -767,11 +770,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 {
@@ -818,6 +824,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 {
@@ -852,6 +861,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 {
@@ -1689,11 +1700,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 {
diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap
index 63f10ff46cd322..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,
@@ -2339,7 +2371,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2355,7 +2387,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2371,7 +2403,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3167,7 +3199,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -5221,7 +5253,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -5721,5 +5753,6 @@
       "endpointId": 2,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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..538e35fca20efc 100644
--- a/examples/build_overrides/pigweed_environment.gni
+++ b/examples/build_overrides/pigweed_environment.gni
@@ -20,20 +20,36 @@ _bootstrap_root = "//third_party/connectedhomeip"
 import("${_bootstrap_root}/build_overrides/pigweed_environment.gni")
 
 # Rebase paths to our root.
+# This rebasing is only done if the paths are repo-relative
+# (i.e. start with "//")
 if (defined(pw_env_setup_CIPD_ARM)) {
-  pw_env_setup_CIPD_ARM =
-      get_path_info("${_bootstrap_root}/${pw_env_setup_CIPD_ARM}", "abspath")
+  _split_CIPD_ARM = string_split(pw_env_setup_CIPD_ARM, "//")
+  if (_split_CIPD_ARM[0] == "") {
+    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")
+  _split_CIPD_PIGWEED = string_split(pw_env_setup_CIPD_PIGWEED, "//")
+  if (_split_CIPD_PIGWEED[0] == "") {
+    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")
+  _split_CIPD_PYTHON = string_split(pw_env_setup_CIPD_PYTHON, "//")
+  if (_split_CIPD_PYTHON[0] == "") {
+    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")
+  _split_VIRTUAL_ENV = string_split(pw_env_setup_VIRTUAL_ENV, "//")
+  if (_split_VIRTUAL_ENV[0] == "") {
+    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 4600bc02061e6d..47d3c7ad3d34b7 100755
--- a/examples/chef/chef.py
+++ b/examples/chef/chef.py
@@ -802,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/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 6bacc7d74d2958..6643553b596f33 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -162,12 +162,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -178,7 +178,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -187,7 +187,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;
@@ -200,55 +200,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;
@@ -464,6 +464,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;
@@ -716,13 +718,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 {
@@ -1537,8 +1539,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 {
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
index b90b6017a279fc..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,
@@ -1804,7 +1836,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1820,7 +1852,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1836,7 +1868,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2632,7 +2664,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -4414,7 +4446,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4795,5 +4827,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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 64dfad6fc4efa2..926a7ab24e2e5c 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
@@ -300,6 +300,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;
@@ -348,13 +350,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 {
@@ -403,6 +405,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -419,11 +422,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 +476,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 +513,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 {
@@ -1791,8 +1802,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 {
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 ec3dcd931353d7..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,
@@ -7844,5 +7876,6 @@
       "endpointId": 5,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter
index 1ebd25fedc1d3b..c97039eead045e 100644
--- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter
+++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter
@@ -225,6 +225,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,13 +479,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 {
@@ -532,6 +534,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -548,11 +551,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 +605,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 +642,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 {
@@ -1737,8 +1748,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 {
@@ -1776,7 +1789,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;
diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.zap
index 8b9d43e1c969d5..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,
@@ -2961,7 +2993,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "temperature",
+              "type": "int16u",
               "included": 1,
               "storageOption": "NVM",
               "singleton": 0,
@@ -6078,5 +6110,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
index 846202f1f4d5b2..cd96025bb67eb3 100644
--- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
+++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
@@ -231,6 +231,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;
@@ -483,13 +485,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 {
@@ -538,6 +540,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -554,11 +557,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 {
@@ -605,6 +611,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 {
@@ -639,6 +648,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,7 +1175,7 @@ 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 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -1172,7 +1183,7 @@ server cluster TargetNavigator = 1285 {
 
   struct TargetInfoStruct {
     int8u identifier = 0;
-    char_string<32> name = 1;
+    char_string name = 1;
   }
 
   readonly attribute TargetInfoStruct targetList[] = 0;
@@ -1189,7 +1200,7 @@ server cluster TargetNavigator = 1285 {
   }
 
   response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -1391,7 +1402,7 @@ server cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : enum8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
@@ -1415,7 +1426,7 @@ server cluster KeypadInput = 1289 {
   }
 
   response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
+    StatusEnum status = 0;
   }
 
   command SendKey(SendKeyRequest): SendKeyResponse = 0;
@@ -1508,8 +1519,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 {
diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
index 333dbf4d9fa34f..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,
@@ -3938,5 +3970,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
index 548750c88aada2..ef3e2bd3915ed5 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -182,12 +182,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -198,14 +198,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;
@@ -218,55 +218,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;
@@ -463,6 +463,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;
@@ -660,13 +662,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 {
@@ -715,6 +717,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -731,11 +734,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 {
@@ -782,6 +788,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 {
@@ -816,6 +825,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 {
@@ -1574,8 +1585,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 {
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
index 2c06878eb0fd64..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,
@@ -2897,7 +2929,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3918,5 +3950,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
index 51807907fd928b..1cd605c3038367 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
@@ -313,6 +313,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;
@@ -565,13 +567,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 {
@@ -620,6 +622,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -636,11 +639,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 +693,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 +730,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 {
@@ -1234,8 +1245,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 {
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
index 5d66b2b8710794..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,
@@ -3100,5 +3132,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
index aaec536fdcfef8..3bb21cad2c8fd2 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -162,12 +162,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -178,7 +178,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -187,7 +187,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;
@@ -200,55 +200,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;
@@ -464,6 +464,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;
@@ -716,13 +718,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 {
@@ -771,6 +773,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -787,11 +790,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 {
@@ -838,6 +844,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 {
@@ -872,6 +881,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 {
@@ -1411,8 +1422,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 {
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
index a910fd9b245a2e..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,
@@ -3151,7 +3183,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3532,5 +3564,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
index ac6ce558704537..ad451cc40b47d2 100644
--- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
+++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
@@ -232,6 +232,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;
@@ -308,7 +310,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;
@@ -357,13 +359,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 {
@@ -412,6 +414,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -428,11 +431,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 +485,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 +522,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 {
@@ -1072,11 +1083,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 {
diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
index ba944f48bbd683..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,
@@ -3533,5 +3565,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
index 4ce6920150b03e..a1dca12a7c3b68 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
@@ -313,6 +313,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;
@@ -565,13 +567,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 {
@@ -620,6 +622,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -636,11 +639,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 +693,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 +730,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 {
@@ -1706,8 +1717,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 {
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
index a759e3d7c11b16..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,
@@ -3429,5 +3461,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
index 3b37d37898d03a..167e1986118ac9 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -162,12 +162,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -178,7 +178,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -187,7 +187,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;
@@ -200,55 +200,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;
@@ -464,6 +464,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;
@@ -716,13 +718,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 {
@@ -771,6 +773,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -787,11 +790,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 {
@@ -838,6 +844,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 {
@@ -872,6 +881,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 {
@@ -1638,8 +1649,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 {
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
index ced7051c1f78ba..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,
@@ -3119,7 +3151,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4022,5 +4054,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
index 131960ba6c3e09..fb585469387214 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
@@ -300,6 +300,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;
@@ -552,13 +554,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 {
@@ -607,6 +609,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -623,11 +626,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 +680,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 +717,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 {
@@ -1276,8 +1287,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 {
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
index c40b276cc84f5c..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,
@@ -3243,5 +3275,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
index 4f6f95e7797613..ef5bcab551a4db 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
@@ -319,6 +319,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;
@@ -571,13 +573,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 {
@@ -626,6 +628,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -642,11 +645,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 +699,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 +736,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 {
@@ -1239,8 +1250,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 {
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
index a88c76d6957e95..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,
@@ -3002,5 +3034,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter
index de09288e6eaf13..7d29171e24ae92 100644
--- a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter
+++ b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter
@@ -231,6 +231,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;
@@ -279,13 +281,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 {
@@ -334,6 +336,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -350,11 +353,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 +407,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 +444,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 {
@@ -933,8 +944,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 {
diff --git a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.zap
index 8e509727894bf5..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,
@@ -2406,5 +2438,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
index ed6f00e760d666..634539605ed12a 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -158,12 +158,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -174,7 +174,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -182,7 +182,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;
@@ -194,55 +194,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;
@@ -458,6 +458,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;
@@ -710,13 +712,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 {
@@ -765,6 +767,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -781,11 +784,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 {
@@ -832,6 +838,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 {
@@ -866,6 +875,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 {
@@ -1587,8 +1598,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 {
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
index 681fd3d7ba8fee..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,
@@ -3039,7 +3071,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3607,5 +3639,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
index b8b6393786c7c6..19f61d9c984d74 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
@@ -319,6 +319,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;
@@ -571,13 +573,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 {
@@ -626,6 +628,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -642,11 +645,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 +699,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 +736,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 {
@@ -1239,8 +1250,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 {
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
index 4b66c78c1a73cc..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,
@@ -3002,5 +3034,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter
index 5930d828f4b306..6f315142dee3bf 100644
--- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter
+++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter
@@ -232,6 +232,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;
@@ -308,7 +310,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;
@@ -357,13 +359,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 {
@@ -412,6 +414,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -428,11 +431,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 +485,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 +522,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 {
@@ -1070,11 +1081,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 {
diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap
index d0766a02e2dec8..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,
@@ -3369,5 +3401,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
index 1c7fb19196b0f8..6d2c02333f1d73 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
@@ -319,6 +319,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;
@@ -571,13 +573,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 {
@@ -626,6 +628,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -642,11 +645,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 +699,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 +736,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 {
@@ -1244,8 +1255,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 {
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
index 53edd8abd939df..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,
@@ -2970,5 +3002,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
index e88f8d822fedd4..8cb041c2b970f1 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
@@ -319,6 +319,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;
@@ -571,13 +573,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 {
@@ -626,6 +628,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -642,11 +645,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 +699,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 +736,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 {
@@ -1255,8 +1266,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 {
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
index 70dcd3fa601752..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,
@@ -2986,5 +3018,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
index 7c51e5dfe95700..491e50edea3090 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
@@ -162,12 +162,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -178,7 +178,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -187,7 +187,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;
@@ -200,55 +200,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;
@@ -464,6 +464,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;
@@ -716,13 +718,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 {
@@ -771,6 +773,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -787,11 +790,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 {
@@ -838,6 +844,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 {
@@ -872,6 +881,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 {
@@ -1370,8 +1381,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 {
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
index 0d48f3a2efe8bb..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,
@@ -3119,7 +3151,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3442,5 +3474,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.matter b/examples/chef/devices/rootnode_onofflight_samplemei.matter
index 6ef987fb4220b0..bb63561efae3a3 100644
--- a/examples/chef/devices/rootnode_onofflight_samplemei.matter
+++ b/examples/chef/devices/rootnode_onofflight_samplemei.matter
@@ -162,12 +162,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -178,7 +178,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -187,7 +187,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;
@@ -200,55 +200,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;
@@ -464,6 +464,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;
@@ -716,13 +718,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 {
@@ -771,6 +773,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -787,11 +790,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 {
@@ -838,6 +844,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 {
@@ -872,6 +881,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 {
@@ -1393,8 +1404,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 {
diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.zap b/examples/chef/devices/rootnode_onofflight_samplemei.zap
index 57669126a8386d..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,
@@ -3119,7 +3151,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3574,5 +3606,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
index f8255600438656..7990f876ec47ff 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
@@ -429,6 +429,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;
@@ -681,13 +683,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 {
@@ -736,6 +738,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -752,11 +755,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 +809,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 {
@@ -837,6 +846,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 {
@@ -1335,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 {
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
index 3d7196817f51fa..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,
@@ -3162,5 +3194,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
index f7d2edd5ca889a..4aa4c41a77e0dc 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
@@ -363,6 +363,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;
@@ -615,13 +617,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 {
@@ -670,6 +672,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -686,11 +689,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 +743,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 +780,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 {
@@ -1269,8 +1280,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 {
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
index c000d81688d972..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,
@@ -3190,5 +3222,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
index 091835dc404eb4..b28c2b6286477d 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
@@ -319,6 +319,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;
@@ -571,13 +573,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 {
@@ -626,6 +628,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -642,11 +645,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 +699,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 +736,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 {
@@ -1258,8 +1269,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 {
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
index c57e7287d9b850..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,
@@ -3012,5 +3044,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.matter b/examples/chef/devices/rootnode_pump_5f904818cc.matter
index ccb84e1f08c5f3..374b98fddf442c 100644
--- a/examples/chef/devices/rootnode_pump_5f904818cc.matter
+++ b/examples/chef/devices/rootnode_pump_5f904818cc.matter
@@ -270,6 +270,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;
@@ -394,13 +396,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 {
@@ -449,6 +451,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -465,11 +468,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 {
@@ -516,6 +522,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 {
@@ -550,6 +559,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 {
@@ -1101,11 +1112,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 {
diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.zap b/examples/chef/devices/rootnode_pump_5f904818cc.zap
index 4d2ca2a38f6ea6..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,
@@ -3545,5 +3577,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter
index 03faacdc5b2ac8..a8c27e6215c259 100644
--- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter
+++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter
@@ -270,6 +270,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;
@@ -394,13 +396,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 {
@@ -449,6 +451,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -465,11 +468,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 {
@@ -516,6 +522,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 {
@@ -550,6 +559,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 {
@@ -1053,11 +1064,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 {
diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.zap b/examples/chef/devices/rootnode_pump_a811bb33a0.zap
index c6ed1ed214c31d..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,
@@ -3003,5 +3035,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter
index ab74b5977accda..ed1cad3db868eb 100644
--- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter
+++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter
@@ -232,6 +232,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;
@@ -308,7 +310,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;
@@ -357,13 +359,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 {
@@ -412,6 +414,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -428,11 +431,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 +485,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 +522,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 {
@@ -1037,11 +1048,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 {
diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap
index f90591eef0a0d6..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,
@@ -3793,5 +3825,6 @@
       "endpointId": 3,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
index b776749b7e2699..09154e0b759f97 100644
--- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
+++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
@@ -300,6 +300,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;
@@ -348,13 +350,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 {
@@ -403,6 +405,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -419,11 +422,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 +476,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 +513,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 {
@@ -1115,8 +1126,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 {
diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap
index 8d10ab99962f47..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,
@@ -3051,5 +3083,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
index f4e280c1938122..4c899818f54a7d 100644
--- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
+++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
@@ -346,6 +346,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;
@@ -394,13 +396,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 {
@@ -449,6 +451,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -465,11 +468,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 {
@@ -516,6 +522,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 {
@@ -550,6 +559,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 {
@@ -1102,8 +1113,27 @@ 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;
+  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;
@@ -1161,8 +1191,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 {
diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap
index 401800be09fd61..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,
@@ -3005,7 +3037,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "TemperatureDisplayModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3021,7 +3053,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "KeypadLockoutEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3148,5 +3180,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter
index 2742d918b4aa9d..c489e13b5103ce 100644
--- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter
+++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter
@@ -300,6 +300,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;
@@ -580,13 +582,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 {
@@ -635,6 +637,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -651,11 +654,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 +708,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 +745,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 {
@@ -1291,8 +1302,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 {
diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap
index bb3717d00bda33..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,
@@ -3085,5 +3117,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
index 04f4c22d42bc9e..c3330f7e5eaba7 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
@@ -89,12 +89,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -105,7 +105,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -113,7 +113,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;
@@ -125,55 +125,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;
@@ -389,6 +389,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;
@@ -641,13 +643,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 {
@@ -696,6 +698,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -712,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 {
@@ -763,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 {
@@ -797,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 {
@@ -1295,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 {
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
index b5d0e9eeb514f5..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,
@@ -2851,7 +2883,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3174,5 +3206,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
index faf2ef72c55b40..c438d63c55ef0e 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
@@ -319,6 +319,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;
@@ -571,13 +573,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 {
@@ -626,6 +628,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -642,11 +645,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 +699,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 +736,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 {
@@ -1238,8 +1249,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 {
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
index 0c4c5c17c371f9..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,
@@ -2986,5 +3018,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
index 8888d71c315223..2f3880ebf8bad4 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
@@ -313,6 +313,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;
@@ -565,13 +567,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 {
@@ -620,6 +622,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -636,11 +639,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 +693,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 +730,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 {
@@ -1360,8 +1371,27 @@ 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;
+  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;
@@ -1487,8 +1517,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 {
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
index 42a23375c9ec67..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,
@@ -3564,7 +3596,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "TemperatureDisplayModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3580,7 +3612,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "KeypadLockoutEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3817,5 +3849,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
index c829b94170e956..8273d1559a610e 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
@@ -313,6 +313,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;
@@ -565,13 +567,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 {
@@ -620,6 +622,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -636,11 +639,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 +693,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 +730,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 {
@@ -1363,8 +1374,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 {
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
index 992590ceb2d483..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,
@@ -3478,5 +3510,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/chef/devices/template.zap b/examples/chef/devices/template.zap
index 87c7e61ab964d9..13c8c53c8cc328 100644
--- a/examples/chef/devices/template.zap
+++ b/examples/chef/devices/template.zap
@@ -2390,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,
@@ -2788,5 +2724,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/thermostat/telink/include/SensorManager.h b/examples/chef/linux/include/CHIPProjectAppConfig.h
similarity index 53%
rename from examples/thermostat/telink/include/SensorManager.h
rename to examples/chef/linux/include/CHIPProjectAppConfig.h
index 2d2cdb9dd44fc6..b6c15f4c98230e 100644
--- a/examples/thermostat/telink/include/SensorManager.h
+++ b/examples/chef/linux/include/CHIPProjectAppConfig.h
@@ -16,32 +16,19 @@
  *    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();
+/**
+ *    @file
+ *          Example project configuration file for CHIP.
+ *
+ *          This is a place to put application or project-specific overrides
+ *          to the default configuration values for general CHIP features.
+ *
+ */
 
-    // Reads new generated sensor value, stores it, and updates local temperature attribute
-    static void TimerEventHandler(k_timer * timer);
-    static void SensorTimerEventHandler(AppEvent * aEvent);
+#pragma once
 
-    static SensorManager sSensorManager;
-};
+// include the CHIPProjectConfig from config/standalone
+#include <CHIPProjectConfig.h>
 
-inline SensorManager & SensorMgr()
-{
-    return SensorManager::sSensorManager;
-}
+// Allows app options (ports) to be configured on launch of app
+#define CHIP_DEVICE_ENABLE_PORT_PARAMS 1
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/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/common/imgui_ui/windows/light.cpp b/examples/common/imgui_ui/windows/light.cpp
index 3e7a44b6fea550..1fe6032281a2c6 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);
 
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/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
index 980c24fa04f3da..0e6f9891abfc4d 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
@@ -300,6 +300,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;
@@ -552,13 +554,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 {
@@ -607,6 +609,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -623,11 +626,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 +680,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 +717,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 {
@@ -1560,8 +1571,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 {
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 1e42d3763612d7..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,
@@ -2188,7 +2220,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2204,7 +2236,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2220,7 +2252,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3016,7 +3048,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -4714,5 +4746,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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 241a75bd33ecc6..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;
diff --git a/examples/darwin-framework-tool/templates/tests/ciTests.json b/examples/darwin-framework-tool/templates/tests/ciTests.json
index fb15c5e8e92e37..1bc430a981a730 100644
--- a/examples/darwin-framework-tool/templates/tests/ciTests.json
+++ b/examples/darwin-framework-tool/templates/tests/ciTests.json
@@ -62,6 +62,8 @@
         "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 057570068ed17c..2b18f41c2b593c 100644
--- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter
+++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter
@@ -320,6 +320,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;
@@ -396,7 +398,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;
@@ -445,13 +447,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 {
@@ -500,6 +502,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -516,11 +519,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 +573,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 +610,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 {
@@ -838,12 +849,7 @@ 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;
 }
 
@@ -1177,11 +1183,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 {
@@ -1317,7 +1325,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 6296916227604a..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,
@@ -2500,14 +2532,6 @@
               "isIncoming": 1,
               "isEnabled": 1
             },
-            {
-              "name": "OpenBasicCommissioningWindow",
-              "code": 1,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
             {
               "name": "RevokeCommissioning",
               "code": 2,
@@ -3919,5 +3943,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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 48ab417a33dff5..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:24
+          $ 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:24
+          $ 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 3d1c46a07769e9..3619291c024505 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
@@ -191,14 +191,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;
+  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;
@@ -619,6 +628,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;
@@ -871,13 +882,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 {
@@ -926,6 +937,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -942,11 +954,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 {
@@ -993,6 +1008,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 {
@@ -1027,6 +1045,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 {
@@ -2378,8 +2398,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 {
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 2223ae18077b66..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,
@@ -2106,7 +2138,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2122,7 +2154,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2138,7 +2170,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2934,7 +2966,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -5848,5 +5880,6 @@
       "endpointId": 2,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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/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 9c7b13ffa22838..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:24
+          $ 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:24
+          $ 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/bouffalolab/data_model/lighting-app-ethernet.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
index a466b86f55ec0b..3b9aead26244af 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter
@@ -182,12 +182,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -198,7 +198,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -210,7 +210,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;
@@ -227,55 +227,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;
@@ -472,6 +472,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;
@@ -724,13 +726,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 {
@@ -779,6 +781,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -795,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 {
@@ -846,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 {
@@ -880,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 {
@@ -1709,8 +1720,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 {
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 83336230621679..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,
@@ -3208,7 +3240,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4293,5 +4325,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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 76d36f766ae31a..cddc0928db536d 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
@@ -182,12 +182,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -198,7 +198,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -210,7 +210,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;
@@ -227,55 +227,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;
@@ -472,6 +472,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;
@@ -724,13 +726,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 {
@@ -779,6 +781,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -795,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 {
@@ -846,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 {
@@ -880,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 {
@@ -1841,8 +1852,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 {
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 f02cecb3f39d02..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,
@@ -2059,7 +2091,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2075,7 +2107,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2091,7 +2123,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2887,7 +2919,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -4184,7 +4216,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -5269,5 +5301,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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 bc1ca07cf1dc8b..8a89f166b8f693 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
@@ -182,12 +182,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -198,7 +198,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -210,7 +210,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;
@@ -227,55 +227,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;
@@ -472,6 +472,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;
@@ -724,13 +726,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 {
@@ -779,6 +781,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -795,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 {
@@ -846,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 {
@@ -880,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 {
@@ -1751,8 +1762,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 {
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 d0caac0d852db9..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,
@@ -3391,7 +3423,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4476,5 +4508,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index 83a898816e870c..9d5ac549470cbc 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -143,14 +143,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;
+  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;
@@ -333,12 +338,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -349,7 +354,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -361,7 +366,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;
@@ -378,55 +383,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;
@@ -623,6 +628,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;
@@ -875,13 +882,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 {
@@ -930,6 +937,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -946,11 +954,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 {
@@ -997,6 +1008,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 {
@@ -1031,6 +1045,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 {
@@ -2171,8 +2187,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 {
@@ -2497,18 +2515,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 803ab8fb056e28..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,
@@ -2069,7 +2101,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2085,7 +2117,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2101,7 +2133,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2897,7 +2929,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -4532,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,
@@ -4645,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,
@@ -4718,7 +4686,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -5105,7 +5073,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -5992,5 +5960,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter
index 119c166301e508..351eaccf2b59ce 100644
--- a/examples/lighting-app/nxp/zap/lighting-on-off.matter
+++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter
@@ -182,12 +182,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -198,7 +198,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -207,7 +207,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;
@@ -220,55 +220,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 +457,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;
@@ -654,13 +656,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 {
@@ -709,6 +711,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -725,11 +728,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 {
@@ -804,6 +810,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 {
@@ -1389,8 +1397,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 {
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap
index e31d44618570b6..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,
@@ -1616,7 +1648,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1632,7 +1664,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1648,7 +1680,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2396,7 +2428,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -3665,7 +3697,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3962,5 +3994,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter
index 738b4d249fac05..46c98d3638c1b8 100644
--- a/examples/lighting-app/qpg/zap/light.matter
+++ b/examples/lighting-app/qpg/zap/light.matter
@@ -182,12 +182,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -198,7 +198,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -207,7 +207,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;
@@ -220,55 +220,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;
@@ -465,6 +465,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;
@@ -662,13 +664,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 {
@@ -717,6 +719,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -733,11 +736,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 {
@@ -812,6 +818,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 {
@@ -1782,11 +1790,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 {
diff --git a/examples/lighting-app/qpg/zap/light.zap b/examples/lighting-app/qpg/zap/light.zap
index 309d95d966a82d..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,
@@ -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,
@@ -3101,7 +3133,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -4782,7 +4814,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -5947,5 +5979,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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 e481c5ff944dc8..0e86b5ec1dd408 100644
--- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
+++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter
@@ -143,14 +143,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;
+  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;
@@ -354,12 +359,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -370,7 +375,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -382,7 +387,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;
@@ -399,55 +404,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;
@@ -644,6 +649,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;
@@ -1132,13 +1139,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 {
@@ -1187,6 +1194,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1203,11 +1211,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 {
@@ -1254,6 +1265,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 {
@@ -1288,6 +1302,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 {
@@ -2230,8 +2246,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 {
@@ -2513,19 +2531,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 nameSupport default = 0x80;
+    callback attribute lastConfiguredBy;
+    callback attribute sceneTableSize default = 16;
+    callback attribute fabricSceneInfo;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 7;
+    callback 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 9457eacb73f528..850576d9647ba9 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,
@@ -2011,7 +2043,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2027,7 +2059,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2043,7 +2075,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2839,7 +2871,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -4072,78 +4104,14 @@
             }
           ],
           "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",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0x80",
@@ -4159,7 +4127,7 @@
               "side": "server",
               "type": "node_id",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
@@ -4175,7 +4143,7 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "16",
@@ -4185,16 +4153,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,
@@ -4271,10 +4239,10 @@
               "side": "server",
               "type": "bitmap32",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4725,7 +4693,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -5933,4 +5901,6 @@
       "networkId": 0
     }
   ]
-}
\ 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 72276cb1aa55ae..f853bf5e8e30ee 100644
--- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
+++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter
@@ -143,14 +143,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;
+  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;
@@ -333,12 +338,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -349,7 +354,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -361,7 +366,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;
@@ -378,55 +383,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;
@@ -623,6 +628,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;
@@ -1111,13 +1118,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 {
@@ -1166,6 +1173,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1182,11 +1190,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 +1244,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 {
@@ -1267,6 +1281,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 {
@@ -2120,8 +2136,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 {
@@ -2353,19 +2371,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 2af72278d94d61..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,
@@ -3248,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,
@@ -3361,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,
@@ -3450,7 +3418,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -3901,7 +3869,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -5108,5 +5076,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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..e33f5f086f670c 100644
--- a/examples/lighting-app/tizen/src/DBusInterface.cpp
+++ b/examples/lighting-app/tizen/src/DBusInterface.cpp
@@ -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/lit-icd-app/lit-icd-common/lit-icd-server-app.matter b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
index 204c4bb8f10412..20a4b71b0fcd71 100644
--- a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
+++ b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
@@ -218,6 +218,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;
@@ -438,13 +440,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 {
@@ -493,6 +495,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -509,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 {
@@ -560,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 {
@@ -594,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 {
@@ -1261,6 +1272,7 @@ 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;
 }
 
 endpoint 0 {
@@ -1320,12 +1332,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 {
@@ -1557,6 +1571,7 @@ endpoint 0 {
     handle command RegisterClient;
     handle command RegisterClientResponse;
     handle command UnregisterClient;
+    handle command StayActiveRequest;
   }
 }
 
diff --git a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap
index fa168ff6d61a1f..b51af3b5ee4e4c 100644
--- a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap
+++ b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.zap
@@ -717,6 +717,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,
@@ -807,7 +839,7 @@
               "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -2010,7 +2042,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2026,7 +2058,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2042,7 +2074,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3324,6 +3356,14 @@
               "source": "client",
               "isIncoming": 1,
               "isEnabled": 1
+            },
+            {
+              "name": "StayActiveRequest",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
             }
           ],
           "attributes": [
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/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index e434cec4947aa5..91ca8528d179ad 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -47,56 +47,6 @@ 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;
-    kOffOnly = 0x4;
-  }
-
-  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 {
   bitmap Feature : bitmap32 {
@@ -281,6 +231,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;
@@ -453,46 +405,6 @@ server cluster LocalizationConfiguration = 43 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
-/** 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 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;
-  readonly attribute event_id eventList[] = 65530;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-}
-
 /** 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
@@ -736,11 +648,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;
@@ -790,13 +704,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 {
@@ -845,6 +759,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -861,11 +776,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 {
@@ -912,6 +830,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 {
@@ -946,6 +867,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 {
@@ -1456,12 +1379,7 @@ 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;
 }
 
@@ -2380,12 +2298,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 {
@@ -2413,18 +2333,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;
@@ -2439,6 +2347,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;
@@ -2662,7 +2571,6 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
 
     handle command OpenCommissioningWindow;
-    handle command OpenBasicCommissioningWindow;
     handle command RevokeCommissioning;
   }
 
@@ -2753,20 +2661,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;
@@ -2788,6 +2682,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 50dab577771eb2..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,
@@ -2874,7 +2768,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2890,7 +2784,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2906,7 +2800,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3702,7 +3596,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -4246,14 +4140,6 @@
               "isIncoming": 1,
               "isEnabled": 1
             },
-            {
-              "name": "OpenBasicCommissioningWindow",
-              "code": 1,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
             {
               "name": "RevokeCommissioning",
               "code": 2,
@@ -5329,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,
@@ -5767,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,
@@ -6660,5 +6414,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter
index db8eee7e4c1964..edc3b3adafea8f 100644
--- a/examples/lock-app/nxp/zap/lock-app.matter
+++ b/examples/lock-app/nxp/zap/lock-app.matter
@@ -223,6 +223,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;
@@ -271,13 +273,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 {
@@ -326,6 +328,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -342,11 +345,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 +427,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 {
@@ -1475,8 +1483,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 {
diff --git a/examples/lock-app/nxp/zap/lock-app.zap b/examples/lock-app/nxp/zap/lock-app.zap
index ca3bc823b8067f..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,
@@ -1409,7 +1441,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1425,7 +1457,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1441,7 +1473,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2189,7 +2221,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -3425,5 +3457,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter
index cda734036be091..40c69b8c583861 100644
--- a/examples/lock-app/qpg/zap/lock.matter
+++ b/examples/lock-app/qpg/zap/lock.matter
@@ -300,6 +300,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;
@@ -497,13 +499,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 {
@@ -552,6 +554,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -568,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 {
@@ -647,6 +653,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 {
@@ -1863,11 +1871,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 {
diff --git a/examples/lock-app/qpg/zap/lock.zap b/examples/lock-app/qpg/zap/lock.zap
index 2e3e19082ec32e..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,
@@ -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,
@@ -3101,7 +3133,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -5210,5 +5242,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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..320fbef7972df9 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
@@ -112,13 +112,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 {
@@ -167,6 +167,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -183,11 +184,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 +230,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 +267,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 {
diff --git a/examples/log-source-app/log-source-common/log-source-app.zap b/examples/log-source-app/log-source-common/log-source-app.zap
index f24d8dc8c4c007..4be1a514aea258 100644
--- a/examples/log-source-app/log-source-common/log-source-app.zap
+++ b/examples/log-source-app/log-source-common/log-source-app.zap
@@ -737,5 +737,6 @@
       "endpointId": 0,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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 cc9cb2c33dfff5..694d7dfd23db47 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
@@ -258,6 +258,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;
@@ -432,13 +434,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 {
@@ -487,6 +489,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -503,11 +506,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 +560,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 +597,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 {
@@ -1034,8 +1045,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 {
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 534246e46c8c30..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,
@@ -2283,5 +2315,6 @@
       "endpointId": 0,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/ota-requestor-app/ameba/README.md b/examples/ota-requestor-app/ameba/README.md
index 8f701e2ba6952c..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:24
+          $ 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:24
+          $ 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/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
index c540e9c3edcbc2..a0016dd0adca29 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
@@ -364,6 +364,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;
@@ -616,13 +618,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 {
@@ -671,6 +673,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -687,11 +690,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 {
@@ -738,6 +744,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 {
@@ -772,6 +781,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 {
@@ -1215,8 +1226,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 {
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 fb1913ba066f28..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,
@@ -3440,5 +3472,6 @@
       "endpointId": 65534,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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/pigweed-app/ameba/README.md b/examples/pigweed-app/ameba/README.md
index f115117d3db775..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:24
+          $ 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:24
+          $ 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 bb87ad56d04e51..3475e909bbd04c 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -191,13 +191,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;
+  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;
@@ -426,12 +431,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -442,7 +447,7 @@ client cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -454,7 +459,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;
@@ -471,55 +476,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 {
@@ -549,12 +554,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -565,7 +570,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -577,7 +582,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;
@@ -594,55 +599,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;
@@ -1018,7 +1023,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;
@@ -1042,7 +1047,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;
@@ -1348,12 +1353,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;
   }
 
@@ -1415,13 +1420,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 {
@@ -1470,6 +1475,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1486,11 +1492,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 {
@@ -1537,6 +1546,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 {
@@ -1571,6 +1583,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 {
@@ -4519,9 +4533,28 @@ 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;
+  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;
@@ -4532,9 +4565,28 @@ 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;
+  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;
@@ -5442,7 +5494,7 @@ 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 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -5450,7 +5502,7 @@ client cluster TargetNavigator = 1285 {
 
   struct TargetInfoStruct {
     int8u identifier = 0;
-    char_string<32> name = 1;
+    char_string name = 1;
   }
 
   readonly attribute TargetInfoStruct targetList[] = 0;
@@ -5468,7 +5520,7 @@ client cluster TargetNavigator = 1285 {
   }
 
   response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -5478,7 +5530,7 @@ 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 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -5486,7 +5538,7 @@ server cluster TargetNavigator = 1285 {
 
   struct TargetInfoStruct {
     int8u identifier = 0;
-    char_string<32> name = 1;
+    char_string name = 1;
   }
 
   readonly attribute TargetInfoStruct targetList[] = 0;
@@ -5866,7 +5918,7 @@ client cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : enum8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
@@ -5890,7 +5942,7 @@ client cluster KeypadInput = 1289 {
   }
 
   response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
+    StatusEnum status = 0;
   }
 
   /** Upon receipt, this SHALL process a keycode as input to the media device. */
@@ -5988,7 +6040,7 @@ server cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : enum8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
@@ -6010,12 +6062,6 @@ 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;
-  }
-
   enum MetricTypeEnum : enum8 {
     kPixels = 0;
     kPercentage = 1;
@@ -6038,12 +6084,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;
   }
@@ -6055,13 +6107,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;
   }
 
@@ -6070,13 +6122,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;
@@ -6085,7 +6137,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;
@@ -6106,7 +6158,7 @@ client cluster ContentLauncher = 1290 {
   }
 
   response struct LauncherResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -6118,12 +6170,6 @@ 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;
-  }
-
   enum MetricTypeEnum : enum8 {
     kPixels = 0;
     kPercentage = 1;
@@ -6146,12 +6192,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;
   }
@@ -6163,13 +6215,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;
   }
 
@@ -6178,13 +6230,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;
@@ -6193,7 +6245,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;
@@ -6214,7 +6266,7 @@ server cluster ContentLauncher = 1290 {
   }
 
   response struct LauncherResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -7388,17 +7440,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 edec3d32b72880..0dbe7077a0b98e 100644
--- a/examples/placeholder/linux/apps/app1/config.zap
+++ b/examples/placeholder/linux/apps/app1/config.zap
@@ -3194,7 +3194,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3210,7 +3210,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3226,7 +3226,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4022,7 +4022,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -8760,7 +8760,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "TemperatureDisplayModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -8776,7 +8776,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "KeypadLockoutEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -8792,7 +8792,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "ScheduleProgrammingVisibilityEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -9094,7 +9094,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "temperature",
+              "type": "int16u",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -10688,7 +10688,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap32",
+              "type": "SupportedProtocolsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -11909,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,
@@ -12006,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,
@@ -12079,7 +12015,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -12714,7 +12650,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -15205,5 +15141,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index 54e7ce4c9b740f..9ecc3de607745d 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -191,13 +191,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;
+  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;
@@ -426,12 +431,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -442,7 +447,7 @@ client cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -454,7 +459,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;
@@ -471,55 +476,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 {
@@ -549,12 +554,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -565,7 +570,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -576,7 +581,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;
@@ -592,55 +597,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;
@@ -1001,7 +1006,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;
@@ -1307,12 +1312,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;
   }
 
@@ -1374,13 +1379,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 {
@@ -1429,6 +1434,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1445,11 +1451,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 {
@@ -1496,6 +1505,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 {
@@ -1530,6 +1542,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 {
@@ -4478,9 +4492,28 @@ 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;
+  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;
@@ -4491,9 +4524,28 @@ 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;
+  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;
@@ -5401,7 +5453,7 @@ 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 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -5409,7 +5461,7 @@ client cluster TargetNavigator = 1285 {
 
   struct TargetInfoStruct {
     int8u identifier = 0;
-    char_string<32> name = 1;
+    char_string name = 1;
   }
 
   readonly attribute TargetInfoStruct targetList[] = 0;
@@ -5427,7 +5479,7 @@ client cluster TargetNavigator = 1285 {
   }
 
   response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -5437,7 +5489,7 @@ 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 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -5445,7 +5497,7 @@ server cluster TargetNavigator = 1285 {
 
   struct TargetInfoStruct {
     int8u identifier = 0;
-    char_string<32> name = 1;
+    char_string name = 1;
   }
 
   readonly attribute TargetInfoStruct targetList[] = 0;
@@ -5825,7 +5877,7 @@ client cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : enum8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
@@ -5849,7 +5901,7 @@ client cluster KeypadInput = 1289 {
   }
 
   response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
+    StatusEnum status = 0;
   }
 
   /** Upon receipt, this SHALL process a keycode as input to the media device. */
@@ -5947,7 +5999,7 @@ server cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : enum8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
@@ -5969,12 +6021,6 @@ 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;
-  }
-
   enum MetricTypeEnum : enum8 {
     kPixels = 0;
     kPercentage = 1;
@@ -5997,12 +6043,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;
   }
@@ -6014,13 +6066,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;
   }
 
@@ -6029,13 +6081,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;
@@ -6044,7 +6096,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;
@@ -6065,7 +6117,7 @@ client cluster ContentLauncher = 1290 {
   }
 
   response struct LauncherResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -6077,12 +6129,6 @@ 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;
-  }
-
   enum MetricTypeEnum : enum8 {
     kPixels = 0;
     kPercentage = 1;
@@ -6105,12 +6151,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;
   }
@@ -6122,13 +6174,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;
   }
 
@@ -6137,13 +6189,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;
@@ -6152,7 +6204,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;
@@ -6173,7 +6225,7 @@ server cluster ContentLauncher = 1290 {
   }
 
   response struct LauncherResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -7352,17 +7404,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 14dfa3b98631db..725e63e1c64cdc 100644
--- a/examples/placeholder/linux/apps/app2/config.zap
+++ b/examples/placeholder/linux/apps/app2/config.zap
@@ -3210,7 +3210,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3226,7 +3226,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3242,7 +3242,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4038,7 +4038,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -8834,7 +8834,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "TemperatureDisplayModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -8850,7 +8850,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "KeypadLockoutEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -8866,7 +8866,7 @@
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "ScheduleProgrammingVisibilityEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -9168,7 +9168,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "temperature",
+              "type": "int16u",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -10770,7 +10770,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap32",
+              "type": "SupportedProtocolsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -11991,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,
@@ -12088,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,
@@ -12161,7 +12097,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -12780,7 +12716,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -14997,5 +14933,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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/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/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/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/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index 3d0caf4c56db88..d14a2b76939d31 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -89,12 +89,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -105,7 +105,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -113,7 +113,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;
@@ -125,55 +125,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;
@@ -387,6 +387,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;
@@ -584,13 +586,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 {
@@ -639,6 +641,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -655,11 +658,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 {
@@ -734,6 +740,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 {
@@ -1470,11 +1478,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 {
diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap
index a219c772561994..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,
@@ -1916,7 +1948,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1932,7 +1964,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1948,7 +1980,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2024,7 +2056,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -3193,7 +3225,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4081,7 +4113,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "temperature",
+              "type": "int16u",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4622,5 +4654,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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 0b53e92fe8207e..09c985bdd451d5 100644
--- a/examples/pump-app/silabs/data_model/pump-thread-app.matter
+++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter
@@ -89,12 +89,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -105,7 +105,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -113,7 +113,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;
@@ -125,55 +125,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;
@@ -387,6 +387,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;
@@ -584,13 +586,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 {
@@ -639,6 +641,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -655,11 +658,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 {
@@ -734,6 +740,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 {
@@ -1470,11 +1478,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 {
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 948f152ae92443..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,
@@ -1916,7 +1948,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1932,7 +1964,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1948,7 +1980,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2024,7 +2056,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -3193,7 +3225,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4081,7 +4113,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "temperature",
+              "type": "int16u",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4622,5 +4654,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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 0b53e92fe8207e..09c985bdd451d5 100644
--- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter
+++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter
@@ -89,12 +89,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -105,7 +105,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -113,7 +113,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;
@@ -125,55 +125,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;
@@ -387,6 +387,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;
@@ -584,13 +586,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 {
@@ -639,6 +641,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -655,11 +658,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 {
@@ -734,6 +740,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 {
@@ -1470,11 +1478,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 {
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 948f152ae92443..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,
@@ -1916,7 +1948,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1932,7 +1964,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1948,7 +1980,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2024,7 +2056,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -3193,7 +3225,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4081,7 +4113,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "temperature",
+              "type": "int16u",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4622,5 +4654,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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/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/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
index ace971a2421210..fce972f5248c2d 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
@@ -312,6 +312,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;
@@ -509,13 +511,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 {
@@ -564,6 +566,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -580,11 +583,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 {
@@ -659,6 +665,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 {
@@ -1356,11 +1364,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 {
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 ef063bb424cddd..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,
@@ -1916,7 +1948,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1932,7 +1964,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1948,7 +1980,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2024,7 +2056,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -3448,5 +3480,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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 f73f0411c1f756..4352e13bf71d13 100644
--- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter
+++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter
@@ -187,6 +187,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;
@@ -263,7 +265,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;
@@ -312,13 +314,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 {
@@ -367,6 +369,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -383,11 +386,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 +440,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 +477,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 {
@@ -705,12 +716,7 @@ 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;
 }
 
@@ -982,11 +988,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 {
@@ -1122,7 +1130,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 0d4058a623ed3b..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,
@@ -2268,14 +2300,6 @@
               "isIncoming": 1,
               "isEnabled": 1
             },
-            {
-              "name": "OpenBasicCommissioningWindow",
-              "code": 1,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
             {
               "name": "RevokeCommissioning",
               "code": 2,
@@ -3733,5 +3757,6 @@
       "endpointId": 3,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter
index c60a06bc035d09..b5f769892d1dbe 100644
--- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter
+++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.matter
@@ -300,6 +300,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;
@@ -552,13 +554,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 {
@@ -607,6 +609,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -623,11 +626,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 +680,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 +717,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 {
@@ -1726,8 +1737,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 {
diff --git a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap
index 15eafe455b17dd..76c0e5ae655023 100644
--- a/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-app.zap
+++ b/examples/resource-monitoring-app/resource-monitoring-common/resource-monitoring-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,
@@ -2209,7 +2241,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2225,7 +2257,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2241,7 +2273,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3037,7 +3069,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -5339,5 +5371,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/resource-monitoring-app/telink/prj.conf b/examples/resource-monitoring-app/telink/prj.conf
index 3996237b452b6b..5fdb933b8ff327 100644
--- a/examples/resource-monitoring-app/telink/prj.conf
+++ b/examples/resource-monitoring-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/rvc-app/rvc-common/rvc-app.matter b/examples/rvc-app/rvc-common/rvc-app.matter
index 9be857b09ec61b..224a8462ea9e7e 100644
--- a/examples/rvc-app/rvc-common/rvc-app.matter
+++ b/examples/rvc-app/rvc-common/rvc-app.matter
@@ -231,6 +231,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;
@@ -279,13 +281,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 {
@@ -334,6 +336,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -350,11 +353,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 +407,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 +444,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 {
@@ -1043,8 +1054,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 {
diff --git a/examples/rvc-app/rvc-common/rvc-app.zap b/examples/rvc-app/rvc-common/rvc-app.zap
index 2a5e70c15e6899..a8453c00f44c68 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,
@@ -2799,5 +2831,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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 103cf374d7a292..e9fb02dfd0c51e 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
@@ -300,6 +300,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;
@@ -784,13 +786,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 {
@@ -839,6 +841,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -855,11 +858,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 +912,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 +949,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 {
@@ -1789,8 +1800,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 {
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 d821b3fa2bc244..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,
@@ -1977,7 +2009,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1993,7 +2025,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2009,7 +2041,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2805,7 +2837,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -4849,5 +4881,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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 1653f8e8764bdf..74c4af426c3abc 100644
--- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
+++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
@@ -185,6 +185,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;
@@ -193,6 +195,155 @@ server cluster BasicInformation = 40 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
+/** Provides an interface for providing OTA software updates */
+client cluster OtaSoftwareUpdateProvider = 41 {
+  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 {
+  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
       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
@@ -263,7 +414,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;
@@ -312,13 +463,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 {
@@ -367,6 +518,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -383,11 +535,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 +589,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 +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 {
@@ -1048,6 +1208,7 @@ server cluster TemperatureMeasurement = 1026 {
 endpoint 0 {
   device type ma_rootdevice = 22, version 1;
 
+  binding cluster OtaSoftwareUpdateProvider;
 
   server cluster Descriptor {
     callback attribute deviceTypeList;
@@ -1094,8 +1255,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 = 2;
+    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 = 1;
+
+    handle command AnnounceOTAProvider;
   }
 
   server cluster LocalizationConfiguration {
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 d30f78430de90d..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,
@@ -2986,5 +3225,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
index 6d1c2337a5f3e1..0120c82d54af9d 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
+++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
@@ -185,13 +185,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;
+  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;
@@ -488,6 +493,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;
@@ -715,7 +722,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;
@@ -994,13 +1001,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 {
@@ -1049,6 +1056,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1065,11 +1073,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 {
@@ -1116,6 +1127,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 {
@@ -1150,6 +1164,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 {
@@ -1863,8 +1879,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 {
@@ -2115,14 +2133,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 d0d8081de50b27..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,
@@ -2015,7 +2047,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2031,7 +2063,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2047,7 +2079,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2843,7 +2875,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -3852,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,
@@ -3949,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": "",
@@ -3974,7 +3942,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4950,5 +4918,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
index 7b9f8c357dcf9e..c97af9e72e22da 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
+++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
@@ -185,13 +185,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;
+  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;
@@ -488,6 +493,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;
@@ -715,7 +722,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;
@@ -994,13 +1001,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 {
@@ -1049,6 +1056,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1065,11 +1073,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 {
@@ -1116,6 +1127,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 {
@@ -1150,6 +1164,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 {
@@ -1772,8 +1788,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 {
@@ -1969,14 +1987,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 4f547325082971..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,
@@ -2994,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,
@@ -3091,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": "",
@@ -3116,7 +3084,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4092,5 +4060,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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/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 3e7e34ed8000ab..82dff269065247 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -367,6 +367,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;
@@ -594,7 +596,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;
@@ -643,13 +645,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 {
@@ -698,6 +700,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -714,11 +717,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 +771,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 +808,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 {
@@ -1633,8 +1644,27 @@ 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;
+  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;
@@ -1707,8 +1737,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 {
diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
index 19a81c7f8379e5..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,
@@ -2222,7 +2254,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2238,7 +2270,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2254,7 +2286,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3050,7 +3082,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -4932,7 +4964,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "TemperatureDisplayModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -4948,7 +4980,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "enum8",
+              "type": "KeypadLockoutEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -5059,5 +5091,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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/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..a68c60a05ce6d0 100644
--- a/examples/tv-app/android/java/AppImpl.h
+++ b/examples/tv-app/android/java/AppImpl.h
@@ -76,7 +76,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 +95,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/ContentAppCommandDelegate.cpp b/examples/tv-app/android/java/ContentAppCommandDelegate.cpp
index 0d232d716bae0a..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())
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..a25a3bdbbc7975 100644
--- a/examples/tv-app/android/java/KeypadInputManager.cpp
+++ b/examples/tv-app/android/java/KeypadInputManager.cpp
@@ -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/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/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/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..e81a9e02568465 100644
--- a/examples/tv-app/tv-common/include/AppTv.h
+++ b/examples/tv-app/tv-common/include/AppTv.h
@@ -61,7 +61,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 +75,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 b38d4dfd31776d..ecee6e792e42bb 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -49,12 +49,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -65,7 +65,7 @@ server cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -77,7 +77,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;
@@ -94,55 +94,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;
@@ -377,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;
@@ -526,7 +528,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;
@@ -575,12 +577,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;
   }
 
@@ -642,13 +644,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 {
@@ -697,6 +699,7 @@ client cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -713,11 +716,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 {
@@ -774,6 +780,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 {
@@ -790,6 +799,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 {
@@ -809,6 +820,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. */
@@ -821,6 +842,8 @@ 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. */
@@ -854,6 +877,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -870,11 +894,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 {
@@ -921,6 +948,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 {
@@ -955,6 +985,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 {
@@ -1828,7 +1860,7 @@ 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;
+  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;
@@ -1904,7 +1936,7 @@ 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 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -1912,7 +1944,7 @@ server cluster TargetNavigator = 1285 {
 
   struct TargetInfoStruct {
     int8u identifier = 0;
-    char_string<32> name = 1;
+    char_string name = 1;
   }
 
   readonly attribute TargetInfoStruct targetList[] = 0;
@@ -1930,7 +1962,7 @@ server cluster TargetNavigator = 1285 {
   }
 
   response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -2164,7 +2196,7 @@ server cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : enum8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
@@ -2188,7 +2220,7 @@ server cluster KeypadInput = 1289 {
   }
 
   response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
+    StatusEnum status = 0;
   }
 
   command SendKey(SendKeyRequest): SendKeyResponse = 0;
@@ -2196,12 +2228,6 @@ 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;
-  }
-
   enum MetricTypeEnum : enum8 {
     kPixels = 0;
     kPercentage = 1;
@@ -2224,12 +2250,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;
   }
@@ -2241,13 +2273,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;
   }
 
@@ -2256,13 +2288,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;
@@ -2271,7 +2303,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;
@@ -2292,7 +2324,7 @@ server cluster ContentLauncher = 1290 {
   }
 
   response struct LauncherResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -2513,8 +2545,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 {
diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
index 27705fdf078559..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,
@@ -2248,7 +2280,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2264,7 +2296,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2280,7 +2312,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3076,7 +3108,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -5500,7 +5532,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap32",
+              "type": "SupportedProtocolsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -6097,7 +6129,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -7142,7 +7174,7 @@
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap32",
+              "type": "SupportedProtocolsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -7637,5 +7669,6 @@
       "endpointId": 3,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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..08b6fc194eee3d 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,
diff --git a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm
index 3f4dbce0700bb7..e2227134d0ee8c 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);
                                  }];
 }
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..90c986a0b330d4 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,
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..6b64a1d18c3786 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)
 {
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 e35a0228d7d9c2..eb90d7d576e809 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
@@ -182,12 +182,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -198,7 +198,7 @@ client cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -210,7 +210,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;
@@ -227,55 +227,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 {
@@ -550,6 +550,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,7 +630,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;
@@ -677,13 +679,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 {
@@ -732,6 +734,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -748,11 +751,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 {
@@ -799,6 +805,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 {
@@ -833,6 +842,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 {
@@ -1347,7 +1358,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. */
 client cluster WakeOnLan = 1283 {
-  readonly attribute optional char_string<32> MACAddress = 0;
+  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;
@@ -1426,7 +1438,7 @@ 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 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -1434,7 +1446,7 @@ client cluster TargetNavigator = 1285 {
 
   struct TargetInfoStruct {
     int8u identifier = 0;
-    char_string<32> name = 1;
+    char_string name = 1;
   }
 
   readonly attribute TargetInfoStruct targetList[] = 0;
@@ -1452,7 +1464,7 @@ client cluster TargetNavigator = 1285 {
   }
 
   response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -1703,7 +1715,7 @@ client cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : enum8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
@@ -1727,7 +1739,7 @@ client cluster KeypadInput = 1289 {
   }
 
   response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
+    StatusEnum status = 0;
   }
 
   /** Upon receipt, this SHALL process a keycode as input to the media device. */
@@ -1736,12 +1748,6 @@ 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;
-  }
-
   enum MetricTypeEnum : enum8 {
     kPixels = 0;
     kPercentage = 1;
@@ -1764,12 +1770,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;
   }
@@ -1781,13 +1793,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;
   }
 
@@ -1796,13 +1808,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;
@@ -1811,7 +1823,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;
@@ -1832,7 +1844,7 @@ client cluster ContentLauncher = 1290 {
   }
 
   response struct LauncherResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -2059,8 +2071,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 {
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 fdcfe88813b957..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,
@@ -4382,5 +4414,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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 14cff8680dd518..0ac18cb306965c 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
@@ -143,13 +143,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;
+  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;
@@ -510,6 +515,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;
@@ -659,7 +666,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;
@@ -938,13 +945,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 {
@@ -993,6 +1000,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1009,11 +1017,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 {
@@ -1060,6 +1071,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 {
@@ -1094,6 +1108,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 {
@@ -2576,8 +2592,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 {
@@ -2894,18 +2912,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 09dd5a1c4d681b..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,
@@ -2046,7 +2078,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2062,7 +2094,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2078,7 +2110,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2874,7 +2906,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -4456,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,
@@ -4553,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,
@@ -4642,7 +4610,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "7",
+              "defaultValue": "15",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -6138,5 +6106,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter
index c99a4d4d5f5b9d..7d67b87aadcb3e 100644
--- a/examples/window-app/common/window-app.matter
+++ b/examples/window-app/common/window-app.matter
@@ -300,6 +300,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;
@@ -810,13 +812,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 {
@@ -865,6 +867,7 @@ server cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -881,11 +884,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 +938,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 +975,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 {
@@ -1869,12 +1880,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 {
diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap
index 4d6a6ea13297d0..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,
@@ -2872,7 +2904,7 @@
               "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2888,7 +2920,7 @@
               "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2904,7 +2936,7 @@
               "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3700,7 +3732,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -7073,5 +7105,6 @@
       "endpointId": 2,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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/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 58df032c9804ef..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:24"
+    - 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:24"
+    - 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:24"
+    - 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 096a8833b13cf5..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:24"
+    - 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:24"
+    - 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:24"
+    - 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 3c1c56bfeec5cc..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:24"
+    - name: "ghcr.io/project-chip/chip-build-vscode:26"
       entrypoint: "bash"
       args:
           - "-c"
@@ -7,7 +7,7 @@ steps:
               git config --global --add safe.directory "*"
               git submodule update --init --recursive
       id: Submodules
-    - name: "ghcr.io/project-chip/chip-build-vscode:24"
+    - name: "ghcr.io/project-chip/chip-build-vscode:26"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -22,7 +22,7 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:24"
+    - 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:24"
+    - 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:24"
+    - 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:24"
+    - 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:24"
+    - 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 f953739b0b013a..92e93e5d86dc45 100644
--- a/integrations/docker/images/base/chip-build/version
+++ b/integrations/docker/images/base/chip-build/version
@@ -1 +1 @@
-25 : [Telink] Update Docker image (Zephyr update)
+26 : [Telink] Update Docker image (Zephyr update)
diff --git a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile
index e853cb4292780d..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=e6a32f41ccec55c2233631406842b71ff270089d
+ARG ZEPHYR_REVISION=e0800ce0375563dfeea8ffc32ebc78d5aaf4f091
 WORKDIR /opt/telink/zephyrproject
 RUN set -x \
     && python3 -m pip install -U --no-cache-dir west \
diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py
index 1736afc01f5f7a..d056281b6a539b 100755
--- a/scripts/build/build/targets.py
+++ b/scripts/build/build/targets.py
@@ -703,6 +703,7 @@ def BuildTelinkTarget():
     target.AppendFixedTargets([
         TargetPart('tlsr9518adk80d', board=TelinkBoard.TLSR9518ADK80D),
         TargetPart('tlsr9528a', board=TelinkBoard.TLSR9528A),
+        TargetPart('tlsr9528a_retention', board=TelinkBoard.TLSR9528A_RETENTION),
     ])
 
     target.AppendFixedTargets([
@@ -732,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/efr32.py b/scripts/build/builders/efr32.py
index 944ef08d130168..31df099d60b1cd 100644
--- a/scripts/build/builders/efr32.py
+++ b/scripts/build/builders/efr32.py
@@ -223,7 +223,7 @@ 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
diff --git a/scripts/build/builders/telink.py b/scripts/build/builders/telink.py
index 0aa6ac68940eec..72ba965c69b1f5 100644
--- a/scripts/build/builders/telink.py
+++ b/scripts/build/builders/telink.py
@@ -119,12 +119,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 +144,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 +155,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 +194,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 e76f940460ad46..558c2c21191eab 100644
--- a/scripts/build/testdata/all_targets_linux_x64.txt
+++ b/scripts/build/testdata/all_targets_linux_x64.txt
@@ -22,5 +22,5 @@ nrf-native-posix-64-tests
 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,resource-monitoring,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_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/examples/gn_silabs_example.sh b/scripts/examples/gn_silabs_example.sh
index 717783cff2925f..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
@@ -242,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
@@ -281,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\" "
@@ -291,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/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/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..8102793ef20b12 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
@@ -88,13 +88,16 @@ 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
+        # Merge examples:
+        #   UserLabelCluster::LabelList changes qualities (access, mandatory)
         #
-        # This should fix the correct types
+        # TODO: add more examples and handle accordingly, sometimes just the
+        #       conformance is changed
         #
-        # LOGGER.error("TODO: Do not know how to merge attribute for %s::%s", cluster.name, existing.definition.name)
-        cluster.attributes.remove(existing)
+        # To replace we could do:
+        #    cluster.attributes.remove(existing)
+        # However then we lose any overrides
+        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 9fe7a58e5ce9f3..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
@@ -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/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 3ab3ed1a586781..7b1c80bb13bb1c 100644
--- a/scripts/py_matter_idl/matter_idl/generators/java/__init__.py
+++ b/scripts/py_matter_idl/matter_idl/generators/java/__init__.py
@@ -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/MatterEventStructs.jinja b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterEventStructs.jinja
index b33ddbfe762839..e5b40bb8910301 100644
--- a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterEventStructs.jinja
+++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterEventStructs.jinja
@@ -15,16 +15,16 @@
 
 {%- 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}})
-    }
+      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)}}
-    }
+      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()) {
@@ -40,27 +40,27 @@
 
 {%- 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
-    }
+      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()
-    }
+      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)}})
+      {%- 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()
       }
-      tlvReader.exitContainer()
-    }
   {%- elif encodable.is_struct -%}
       {%- set struct = encodable.get_underlying_struct() -%}
       matter.devicecontroller.cluster.structs.{{source.name}}Cluster{{struct.name}}.fromTlv({{tag}}, tlvReader)
@@ -91,23 +91,22 @@
  */
 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.TlvParsingException
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
 
-import java.util.Optional
-
-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 {
+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")
diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterStructs.jinja b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterStructs.jinja
index 1ec9fed3a34f08..8a8769c0ceb95b 100644
--- a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterStructs.jinja
+++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterStructs.jinja
@@ -15,16 +15,16 @@
 
 {%- 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}})
-    }
+      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)}}
-    }
+      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()) {
@@ -91,23 +91,22 @@
  */
 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.TlvParsingException
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
 
-import java.util.Optional
-
-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 {
+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")
@@ -132,7 +131,7 @@ class {{cluster.name}}Cluster{{struct.name}} (
     private const val TAG_{{field.name | constcase}} = {{field.code}}
     {%- endfor %}
 
-    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader) : {{cluster.name}}Cluster{{struct.name}} {
+    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): {{cluster.name}}Cluster{{struct.name}} {
       tlvReader.enterStructure(tlvTag)
       {% for field in struct.fields %}
         {%- set decodable = field | asEncodable(typeLookup) %}
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 3970db4c807dc5..9886eb91264dfc 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
@@ -3398,7 +3398,7 @@ server cluster ContentLauncher = 1290 {
     kURLPlayback = 0x2;
   }
 
-  bitmap SupportedStreamingProtocol : BITMAP32 {
+  bitmap SupportedProtocolsBitmap : BITMAP32 {
     kDash = 0x1;
     kHls = 0x2;
   }
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_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 a120c0c25b4e99..cc21c740b964a6 100644
--- a/scripts/rules.matterlint
+++ b/scripts/rules.matterlint
@@ -55,6 +55,7 @@ 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-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";
@@ -79,6 +80,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";
diff --git a/scripts/setup/bootstrap.sh b/scripts/setup/bootstrap.sh
index 57864b3b410e5e..eda6e97ad9c9bd 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"
 
@@ -165,6 +165,15 @@ if [ -n "$BASH" ]; then
     . "$_CHIP_ROOT/scripts/helpers/bash-completion.sh"
 fi
 
+# Update relative paths to absolute (if they exist)
+# to make sure loading of paths works in build_examples
+#
+# See https://github.com/project-chip/connectedhomeip/issues/30475
+# for details
+scripts/setup/gni_make_paths_absolute.py \
+    --root "$_CHIP_ROOT" \
+    build_overrides/pigweed_environment.gni
+
 unset -f _bootstrap_or_activate
 unset -f _install_additional_pip_requirements
 
diff --git a/scripts/setup/gni_make_paths_absolute.py b/scripts/setup/gni_make_paths_absolute.py
new file mode 100755
index 00000000000000..17f03820458bba
--- /dev/null
+++ b/scripts/setup/gni_make_paths_absolute.py
@@ -0,0 +1,54 @@
+#!/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
+
+
+def _make_paths_absolute(gni_file: str, root: str):
+    with open(gni_file, "rt", encoding="utf8") as f:
+        data = f.read()
+
+    # Data will contain key/value pairs like:
+    #   pw_env_setup_CIPD_PIGWEED = "//../home/vscode/pigweed/env/cipd/packages/pigweed"
+    #
+    # Looking to replace relative paths (starting with "//../")
+    # to absolute paths from the root
+    if not root.endswith("/"):
+        root = root + "/"
+
+    new_data = data.replace('"//../', f'"{root}../')
+
+    if new_data == data:
+        return
+
+    with open(gni_file, "wt", encoding="utf8") as f:
+        f.write(new_data)
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description=__doc__,
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+    )
+    parser.add_argument(
+        '--root', '-r', required=True,
+        help="Set the root used by the build (usually CHIP_ROOT)"
+    )
+    parser.add_argument('gni_file', type=str, help="GNI file to process")
+    _make_paths_absolute(**vars(parser.parse_args()))
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/setup/zap.json b/scripts/setup/zap.json
index 94d4799af8f241..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.30-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.30-nightly.1"]
+            "tags": ["version:2@v2023.11.08-nightly.1"]
         }
     ]
 }
diff --git a/scripts/setup/zap.version b/scripts/setup/zap.version
index 7cea852e9c90f1..7bcbd806cdbdbd 100644
--- a/scripts/setup/zap.version
+++ b/scripts/setup/zap.version
@@ -1 +1 @@
-v2023.10.30-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..d0b2635bcf3398 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'))
@@ -65,8 +77,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 +97,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 ba266f2bde9d70..0ecd9313e27e91 100644
--- a/scripts/tests/chiptest/__init__.py
+++ b/scripts/tests/chiptest/__init__.py
@@ -235,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/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/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/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/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap
index 3065c7967d2df1..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,
@@ -4032,7 +4032,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -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,
@@ -11634,7 +11634,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "temperature",
+              "type": "int16u",
               "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,
@@ -16797,5 +16797,6 @@
       "endpointId": 65534,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap
index e97a81df3d52ce..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,
@@ -3037,7 +3037,7 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaults",
+              "name": "ActiveNetworkFaultsList",
               "code": 62,
               "mfgCode": null,
               "side": "server",
@@ -4855,7 +4855,7 @@
               "code": 15,
               "mfgCode": null,
               "side": "server",
-              "type": "LevelControlOptions",
+              "type": "OptionsBitmap",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -5742,5 +5742,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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 5403f99d2c747e..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
@@ -234,6 +234,7 @@
     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 */ \
@@ -292,6 +293,7 @@
     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 */ \
@@ -350,6 +352,7 @@
     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 */ \
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 cc5ff6c06f8d17..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
@@ -759,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) */                                                                            \
@@ -1182,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 */                               \
                                                                                                                                    \
@@ -1223,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 */                                 \
                                                                                                                                    \
@@ -1427,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) */                                                                            \
@@ -1559,6 +1558,10 @@
         (EmberAfGenericClusterFunction) emberAfTimeFormatLocalizationClusterServerInitCallback,                                    \
         (EmberAfGenericClusterFunction) MatterTimeFormatLocalizationClusterServerPreAttributeChangedCallback,                      \
     };                                                                                                                             \
+    const EmberAfGenericClusterFunction chipFuncArrayScenesServer[] = {                                                            \
+        (EmberAfGenericClusterFunction) emberAfScenesClusterServerInitCallback,                                                    \
+        (EmberAfGenericClusterFunction) MatterScenesClusterServerShutdownCallback,                                                 \
+    };                                                                                                                             \
     const EmberAfGenericClusterFunction chipFuncArrayOnOffServer[] = {                                                             \
         (EmberAfGenericClusterFunction) emberAfOnOffClusterServerInitCallback,                                                     \
         (EmberAfGenericClusterFunction) MatterOnOffClusterServerShutdownCallback,                                                  \
@@ -2359,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, \
@@ -2722,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, \
@@ -2931,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, \
@@ -3025,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 },                                                                                       \
     }
 
@@ -3038,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/zap_execution.py b/scripts/tools/zap/zap_execution.py
index 4aa1eac29d4bed..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.28'
+MIN_ZAP_VERSION = '2023.11.8'
 
 
 class ZapTool:
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/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 dac66d04f58bbd..5e4efd735be26c 100644
--- a/src/app/CompatEnumNames.h
+++ b/src/app/CompatEnumNames.h
@@ -46,15 +46,39 @@ 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;
+} // 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/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..db9e4cdfe241ab 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;
diff --git a/src/app/MessageDef/AttributePathIB.h b/src/app/MessageDef/AttributePathIB.h
index 6441b18ec59eb9..5035bbd46018c8 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>
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..b3bd2f4181d2c9 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 [in] 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.h b/src/app/MessageDef/CommandStatusIB.h
index 8574937291375d..8614df28cab4b5 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>
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 0b68c12c96a7dd..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.
     //
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.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/src/app/util/attribute-size-util.cpp b/src/app/SpecificationVersion.h
similarity index 54%
rename from src/app/util/attribute-size-util.cpp
rename to src/app/SpecificationVersion.h
index f8cf9507f11b53..b0570dad14c4ce 100644
--- a/src/app/util/attribute-size-util.cpp
+++ b/src/app/SpecificationVersion.h
@@ -1,6 +1,6 @@
-/**
+/*
  *
- *    Copyright (c) 2020 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.
@@ -15,25 +15,17 @@
  *    limitations under the License.
  */
 
-#include <app/util/af.h>
-
-#include <app-common/zap-generated/attribute-type.h>
-
-using namespace chip;
-
-static const uint8_t attributeSizes[] = {
-#include <app-common/zap-generated/attribute-size.h>
-};
-
-uint8_t emberAfGetDataSize(uint8_t dataType)
-{
-    for (unsigned i = 0; (i + 1) < sizeof(attributeSizes); i += 2)
-    {
-        if (attributeSizes[i] == dataType)
-        {
-            return attributeSizes[i + 1];
-        }
-    }
+#pragma once
 
-    return 0;
-}
+/**
+ * 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/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/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..b826351b791731 100644
--- a/src/app/clusters/color-control-server/color-control-server.cpp
+++ b/src/app/clusters/color-control-server/color-control-server.cpp
@@ -1581,7 +1581,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;
@@ -1786,7 +1786,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;
@@ -1970,7 +1970,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;
@@ -2179,7 +2179,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;
@@ -2706,7 +2706,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;
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/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp
index c7e376aa5a99f3..a2bfc1a58b794e 100644
--- a/src/app/clusters/level-control/level-control.cpp
+++ b/src/app/clusters/level-control/level-control.cpp
@@ -104,24 +104,21 @@ 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
 class DefaultLevelControlSceneHandler : public scenes::DefaultSceneHandlerImpl
@@ -246,7 +243,7 @@ class DefaultLevelControlSceneHandler : public scenes::DefaultSceneHandlerImpl
                                                                                             : 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>>(),
+                                    chip::Optional<BitMask<OptionsBitmap>>(), chip::Optional<BitMask<OptionsBitmap>>(),
                                     INVALID_STORED_LEVEL);
 
         if (status != Status::Success)
@@ -351,7 +348,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 +491,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 +557,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,8 +604,7 @@ 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
 }
 
@@ -644,10 +639,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 +659,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 +683,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 +708,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 +733,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 +754,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 +765,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 +910,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 +929,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 +977,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 +1059,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 +1107,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 +1119,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 +1199,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;
diff --git a/src/app/clusters/network-commissioning/network-commissioning.cpp b/src/app/clusters/network-commissioning/network-commissioning.cpp
index 1026105160ffbb..68dfed344e0da6 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));
@@ -128,6 +182,13 @@ void Instance::InvokeCommand(HandlerContext & ctxt)
         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 +201,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;
         });
 
@@ -213,8 +277,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 +348,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 +381,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 +437,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 +562,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 +596,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 +611,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;
@@ -452,20 +630,102 @@ void Instance::HandleReorderNetwork(HandlerContext & ctx, const Commands::Reorde
 {
     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);
@@ -500,7 +760,7 @@ void Instance::OnResult(Status commissioningError, CharSpan debugText, int32_t i
     mLastNetworkingStatusValue.SetNonNull(commissioningError);
 
     commandHandle->AddResponse(mPath, response);
-    if (commissioningError == NetworkCommissioningStatusEnum::kSuccess)
+    if (commissioningError == Status::kSuccess)
     {
         CommitSavedBreadcrumb();
     }
@@ -525,7 +785,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 +871,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 +932,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();
     }
@@ -719,39 +979,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 +1019,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 +1048,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..d11b118a5be854 100644
--- a/src/app/clusters/network-commissioning/network-commissioning.h
+++ b/src/app/clusters/network-commissioning/network-commissioning.h
@@ -112,34 +112,17 @@ 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 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/on-off-server/on-off-server.cpp b/src/app/clusters/on-off-server/on-off-server.cpp
index bbd35235e99555..a9f13a1b7ba4cc 100644
--- a/src/app/clusters/on-off-server/on-off-server.cpp
+++ b/src/app/clusters/on-off-server/on-off-server.cpp
@@ -104,101 +104,15 @@ 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];
 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,38 +213,22 @@ 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));
 }
@@ -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
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 7f5870f0ecf2b3..afb5295edf4868 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
@@ -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 9f659fab068f50..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>
@@ -39,69 +40,7 @@ static_assert(kMaxScenesPerEndpoint <= CHIP_CONFIG_MAX_SCENES_TABLE_SIZE,
               "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;
-
-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 constexpr uint8_t kMaxFabrics          = CHIP_CONFIG_MAX_FABRICS;
 
 /**
  * @brief Implementation of a storage in nonvolatile storage of the scene table.
@@ -146,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 08f92596757309..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,42 +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)
-        {
-            // 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);
-        }
-    }
+    ReturnErrorOnFailure(chip::Server::GetInstance().GetFabricTable().AddFabricDelegate(&gFabricDelegate));
 
     mIsInitialized = true;
     return CHIP_NO_ERROR;
@@ -267,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));
 
@@ -360,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());
@@ -407,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;
 }
@@ -421,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());
@@ -453,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;
 }
@@ -511,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);
@@ -559,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)
@@ -609,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);
@@ -655,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);
@@ -694,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));
 
@@ -708,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;
@@ -720,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));
     }
 
@@ -731,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;
     }
 
@@ -881,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));
 
@@ -902,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));
 
@@ -916,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/time-synchronization-server/time-synchronization-server.cpp b/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp
index 39e00dd98dbe14..7750c56be352d0 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 };
     }
 }
 
diff --git a/src/app/common/templates/config-data.yaml b/src/app/common/templates/config-data.yaml
index 1665fdbbfbee06..d26d067f852802 100644
--- a/src/app/common/templates/config-data.yaml
+++ b/src/app/common/templates/config-data.yaml
@@ -2,19 +2,15 @@ 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
 
 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
 
 EnumsNotUsedAsTypeInXML:
     # List of enums that are not used as a type in XML. By adding an enum
@@ -63,6 +59,7 @@ ClustersWithInitFunctions:
     - Thermostat
     - Mode Select
     - Sample MEI
+    - Scenes
 
 ClustersWithAttributeChangedFunctions:
     - Bridged Device Basic
@@ -79,6 +76,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..d8159493bc925b 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",
diff --git a/src/app/icd/BUILD.gn b/src/app/icd/BUILD.gn
index aa0a6ef67bf28b..8b8f10fd5c1587 100644
--- a/src/app/icd/BUILD.gn
+++ b/src/app/icd/BUILD.gn
@@ -42,10 +42,25 @@ source_set("manager") {
     ":cluster",
     ":notifier",
     ":observer",
+    ":sender",
     "${chip_root}/src/credentials:credentials",
   ]
 }
 
+source_set("sender") {
+  sources = [
+    "ICDCheckInSender.cpp",
+    "ICDCheckInSender.h",
+  ]
+
+  public_deps = [
+    ":cluster",
+    "${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") {
diff --git a/src/app/icd/ICDCheckInSender.cpp b/src/app/icd/ICDCheckInSender.cpp
new file mode 100644
index 00000000000000..bd2b86bb24fdd3
--- /dev/null
+++ b/src/app/icd/ICDCheckInSender.cpp
@@ -0,0 +1,104 @@
+/*
+ *
+ *    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 <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)
+{
+    mResolveInProgress = false;
+
+    VerifyOrReturn(CHIP_NO_ERROR != SendCheckInMsg(result.address),
+                   ChipLogError(AppServer, "Failed to send the ICD Check-In message"));
+}
+
+void ICDCheckInSender::OnNodeAddressResolutionFailed(const PeerId & peerId, CHIP_ERROR reason)
+{
+    mResolveInProgress = false;
+    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->DataLength() };
+
+    // TODO retrieve Check-in counter
+    CounterType counter = 0;
+
+    ReturnErrorOnFailure(CheckinMessage::GenerateCheckinMessagePayload(mKey, counter, ByteSpan(), output));
+
+    VerifyOrReturnError(mExchangeManager->GetSessionManager() != nullptr, CHIP_ERROR_INTERNAL);
+
+    Optional<SessionHandle> session =
+        mExchangeManager->GetSessionManager()->CreateUnauthenticatedSession(addr, GetDefaultMRPConfig());
+    VerifyOrReturnError(session.HasValue(), CHIP_ERROR_NO_MEMORY);
+
+    // Using default MRP since we are not doing MRP in this context
+    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));
+
+    // TODO #30492
+    // Device must stay active during MDNS resolution
+    CHIP_ERROR err = AddressResolve::Resolver::Instance().LookupNode(request, mAddressLookupHandle);
+
+    if (err == CHIP_NO_ERROR)
+    {
+        mResolveInProgress = true;
+    }
+
+    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/ICDManager.cpp b/src/app/icd/ICDManager.cpp
index c53a0b66cb8d7a..65aca79acda778 100644
--- a/src/app/icd/ICDManager.cpp
+++ b/src/app/icd/ICDManager.cpp
@@ -44,12 +44,10 @@ uint8_t ICDManager::OpenExchangeContextCount = 0;
 static_assert(UINT8_MAX >= CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS,
               "ICDManager::OpenExchangeContextCount 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);
 
     bool supportLIT = SupportsFeature(Feature::kLongIdleTimeSupport);
@@ -62,9 +60,8 @@ void ICDManager::Init(PersistentStorageDelegate * storage, FabricTable * fabricT
     // VerifyOrDieWithMsg((supportLIT == false) && (GetSlowPollingInterval() <= GetSITPollingThreshold()) , AppServer,
     //                    "LIT support is required for slow polling intervals superior to 15 seconds");
 
-    mStorage       = storage;
-    mFabricTable   = fabricTable;
-    mStateObserver = stateObserver;
+    mStorage     = storage;
+    mFabricTable = fabricTable;
     VerifyOrDie(ICDNotifier::GetInstance().Subscribe(this) == CHIP_NO_ERROR);
     mSymmetricKeystore = symmetricKeystore;
 
@@ -90,20 +87,20 @@ void ICDManager::Shutdown()
     mOperationalState = OperationalState::IdleMode;
     mStorage          = nullptr;
     mFabricTable      = nullptr;
+    mStateObserverPool.ReleaseAll();
 }
 
 bool ICDManager::SupportsFeature(Feature feature)
 {
     // Can't use attribute accessors/Attributes::FeatureMap::Get in unit tests
-#ifndef CONFIG_BUILD_FOR_HOST_UNIT_TEST
-    bool success        = false;
+#if !CONFIG_BUILD_FOR_HOST_UNIT_TEST
     uint32_t featureMap = 0;
-    success             = (Attributes::FeatureMap::Get(kRootEndpointId, &featureMap) == EMBER_ZCL_STATUS_SUCCESS);
-
+    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
+#endif // !CONFIG_BUILD_FOR_HOST_UNIT_TEST
 }
 
 void ICDManager::UpdateICDMode()
@@ -129,7 +126,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())
@@ -202,7 +204,7 @@ void ICDManager::UpdateOperationState(OperationalState state)
                 ChipLogError(AppServer, "Failed to set Polling Interval: err %" CHIP_ERROR_FORMAT, err.Format());
             }
 
-            mStateObserver->OnEnterActiveMode();
+            postObserverEvent(ObserverEventType::EnterActiveMode);
         }
         else
         {
@@ -264,7 +266,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. */
@@ -339,5 +341,60 @@ void ICDManager::OnICDManagementServerEvent(ICDManagementEvents event)
     }
 }
 
+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 c12f194798ccf6..29ff0722c7e54d 100644
--- a/src/app/icd/ICDManager.h
+++ b/src/app/icd/ICDManager.h
@@ -33,12 +33,21 @@ namespace app {
 // Used in unit tests
 class TestICDManager;
 
+// This structure is used for the creation an ObjectPool of ICDStateObserver pointers
+
 /**
  * @brief ICD Manager is responsible of processing the events and triggering the correct action for an ICD
  */
 class ICDManager : public ICDListener
 {
 public:
+    struct ObserverPointer
+    {
+        ObserverPointer(ICDStateObserver * obs) : mObserver(obs) {}
+        ~ObserverPointer() { mObserver = nullptr; }
+        ICDStateObserver * mObserver;
+    };
+
     enum class OperationalState : uint8_t
     {
         IdleMode,
@@ -51,21 +60,48 @@ 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; };
@@ -110,9 +146,9 @@ class ICDManager : public ICDListener
     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
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/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/Dnssd.cpp b/src/app/server/Dnssd.cpp
index a2042c213b9b30..cb627af4348dea 100644
--- a/src/app/server/Dnssd.cpp
+++ b/src/app/server/Dnssd.cpp
@@ -489,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 26c880d2baa7fd..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;
@@ -119,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..8aa1d37a99122e 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)
diff --git a/src/app/server/Server.h b/src/app/server/Server.h
index 7206696ba95f99..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>
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 0972f4388db42f..693d1bc5630f73 100644
--- a/src/app/tests/TestICDManager.cpp
+++ b/src/app/tests/TestICDManager.cpp
@@ -65,6 +65,7 @@ class TestICDStateObserver : public app::ICDStateObserver
 public:
     void OnEnterActiveMode() {}
     void OnTransitionToIdle() {}
+    void OnICDModeChange() {}
 };
 
 TestICDStateObserver mICDStateObserver;
@@ -89,7 +90,8 @@ class TestContext : public Test::AppContext
         {
             return FAILURE;
         }
-        ctx->mICDManager.Init(&ctx->testStorage, &ctx->GetFabricTable(), &mICDStateObserver, &(ctx->mKeystore));
+        ctx->mICDManager.Init(&ctx->testStorage, &ctx->GetFabricTable(), &(ctx->mKeystore));
+        ctx->mICDManager.RegisterObserver(&mICDStateObserver);
         return SUCCESS;
     }
 
diff --git a/src/app/tests/TestICDMonitoringTable.cpp b/src/app/tests/TestICDMonitoringTable.cpp
index a228e3368696fc..170ece20e1778d 100644
--- a/src/app/tests/TestICDMonitoringTable.cpp
+++ b/src/app/tests/TestICDMonitoringTable.cpp
@@ -61,6 +61,39 @@ constexpr uint8_t kKeyBuffer3a[] = {
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f
 };
 
+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)
 {
     TestSessionKeystoreImpl keystore;
@@ -393,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 b54d03757bb1f3..25f26119b05c8a 100644
--- a/src/app/tests/TestReadInteraction.cpp
+++ b/src/app/tests/TestReadInteraction.cpp
@@ -1940,7 +1940,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,
@@ -2283,7 +2283,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;
 
@@ -2463,7 +2464,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,
@@ -2615,7 +2616,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,
@@ -2692,7 +2693,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,
@@ -2765,7 +2766,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,
@@ -2821,7 +2822,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,
@@ -2933,7 +2934,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();
     }
@@ -2994,7 +2995,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);
@@ -3116,7 +3118,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);
@@ -3293,7 +3296,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);
@@ -3365,7 +3369,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);
@@ -3469,7 +3474,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);
@@ -3571,7 +3577,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);
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/TestIcdManagementCluster.yaml b/src/app/tests/suites/TestIcdManagementCluster.yaml
index 05a5f8ad8fcf08..626945db5e8d11 100644
--- a/src/app/tests/suites/TestIcdManagementCluster.yaml
+++ b/src/app/tests/suites/TestIcdManagementCluster.yaml
@@ -32,19 +32,19 @@ tests:
       command: "readAttribute"
       attribute: "IdleModeDuration"
       response:
-          value: 300
+          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 1137d1dee7c5e3..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
 
     #
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_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_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/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
index eb629bb708fdde..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
diff --git a/src/app/tests/suites/ciTests.json b/src/app/tests/suites/ciTests.json
index 50a0b726d5db9c..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",
@@ -322,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 1b15ff761f9a4e..5c7f3fc9f318d3 100644
--- a/src/app/tests/suites/commands/discovery/DiscoveryCommands.cpp
+++ b/src/app/tests/suites/commands/discovery/DiscoveryCommands.cpp
@@ -175,16 +175,15 @@ void DiscoveryCommands::OnNodeDiscovered(const chip::Dnssd::DiscoveredNodeData &
         data.mrpRetryIntervalActive.SetValue(nodeData.resolutionData.mrpRetryIntervalActive.Value().count());
     }
 
-    // TODO need to add new entries for kDefaultResponse in DiscoveryCommands.js (project-chip/zap) before adding this
-    // if (nodeData.resolutionData.mrpRetryActiveThreshold.HasValue())
-    // {
-    //     data.mrpRetryActiveThreshold.SetValue(nodeData.resolutionData.mrpRetryActiveThreshold.Value().count());
-    // }
-
-    // if (nodeData.resolutionData.isICDOperatingAsLIT.HasValue())
-    // {
-    //     data.isICDOperatingAsLIT.SetValue(resolutionData.isICDOperatingAsLIT.Value());
-    // }
+    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/util/util.cpp b/src/app/util/util.cpp
index 619ecdcd923dcc..1add78990aa7e9 100644
--- a/src/app/util/util.cpp
+++ b/src/app/util/util.cpp
@@ -158,6 +158,8 @@ void MatterRefrigeratorAndTemperatureControlledCabinetModePluginServerInitCallba
 void MatterOperationalStatePluginServerInitCallback() {}
 void MatterRvcOperationalStatePluginServerInitCallback() {}
 void MatterDishwasherAlarmPluginServerInitCallback() {}
+void MatterBooleanSensorConfigurationPluginServerInitCallback() {}
+void MatterValveConfigurationAndControlPluginServerInitCallback() {}
 // ****************************************
 // Print out information about each cluster
 // ****************************************
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/zcl/data-model/all.xml b/src/app/zap-templates/zcl/data-model/all.xml
index 442ee806741cc3..4bc7ef7ee81604 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,6 +24,7 @@
    <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" />
@@ -54,6 +56,7 @@
    <xi:include href="chip/operational-credentials-cluster.xml" />
    <xi:include href="chip/operational-state-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" />
@@ -80,9 +83,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/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/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..e3fa9f85c51c21
--- /dev/null
+++ b/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml
@@ -0,0 +1,264 @@
+<?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>
+
+  <enum name="PowerSavingsEnum" type="enum8">
+    <cluster code="0x0096"/>
+    <item name="Low" value="0x0"/>
+    <item name="Medium" value="0x1"/>
+    <item name="High" 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="PowerSavingsEnum"/>
+  </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>
+    <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="DEVICE_CLASS" type="DeviceClassBitmap" default="0" writable="false">DeviceClass</attribute>
+    <attribute side="server" code="0x0001" define="LOAD_CONTROL_PROGRAMS" type="ARRAY" entryType="LoadControlProgramStruct" writable="false">LoadControlPrograms</attribute>
+    <attribute side="server" code="0x0002" define="NUMBER_OF_LOAD_CONTROL_PROGRAMS" type="int8u" min="5" writable="false" default="5">NumberOfLoadControlPrograms</attribute>
+    <attribute side="server" code="0x0003" define="LOAD_CONTROL_EVENTS" type="ARRAY" entryType="LoadControlEventStruct" writable="false">Events</attribute>
+    <attribute side="server" code="0x0004" define="LOAD_CONTROL_ACTIVE_EVENTS" type="ARRAY" entryType="LoadControlEventStruct" writable="false">ActiveEvents</attribute>
+    <attribute side="server" code="0x0005" define="NUMBER_OF_EVENTS_PER_PROGRAM" type="int8u" min="10" writable="false" default="10">NumberOfEventsPerProgram</attribute>
+    <attribute side="server" code="0x0006" define="NUMBER_OF_TRANSITIONS" type="int8u" min="3" writable="false" default="3">NumberOfTransistions</attribute>
+    <attribute side="server" code="0x0007" 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="0x0008" 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/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/keypad-input-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml
index 37fdfec1abcfbd..aaa1820fae3320 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
@@ -32,12 +32,12 @@ limitations under the License.
 
     <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"/>
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/matter-devices.xml b/src/app/zap-templates/zcl/data-model/chip/matter-devices.xml
index b88f9cd12943cb..03cb6da5199103 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
@@ -2032,6 +2032,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/mode-base-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml
index 2f89779bda6b4a..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
@@ -30,6 +30,7 @@ This is because zap does not currently support generating code for clusters that
     <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"/>
@@ -42,6 +43,7 @@ This is because zap does not currently support generating code for clusters that
     <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"/>
@@ -88,6 +90,7 @@ This is because zap does not currently support generating code for clusters that
     <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/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/scene.xml b/src/app/zap-templates/zcl/data-model/chip/scene.xml
index 69455e4de08469..b8bcbc1243a1dd 100644
--- a/src/app/zap-templates/zcl/data-model/chip/scene.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/scene.xml
@@ -25,6 +25,15 @@ limitations under the License.
     <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"/>
@@ -48,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="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}]}'
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/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/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/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/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 919bce50a6a425..e7809fe26417bb 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,6 +38,7 @@
         "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",
@@ -72,6 +74,7 @@
         "operational-credentials-cluster.xml",
         "operational-state-cluster.xml",
         "operational-state-rvc-cluster.xml",
+        "oven-mode-cluster.xml",
         "pressure-measurement-cluster.xml",
         "power-source-cluster.xml",
         "power-source-configuration-cluster.xml",
@@ -100,8 +103,10 @@
         "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",
@@ -160,7 +165,9 @@
             "SerialNumber",
             "UniqueID",
             "CapabilityMinima",
-            "ProductAppearance"
+            "ProductAppearance",
+            "SpecificationVersion",
+            "MaxPathsPerInvoke"
         ],
         "Bridged Device Basic Information": ["ProductAppearance"],
         "Descriptor": ["ClusterRevision"],
@@ -219,7 +226,6 @@
             "FeatureMap",
             "ThreadMetrics"
         ],
-        "Scenes": ["SceneCount", "RemainingCapacity"],
         "Unit Testing": [
             "struct_attr",
             "nullable_struct",
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index f342bf2a2868e5..44e19cee93c18e 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",
@@ -38,6 +39,7 @@
         "dishwasher-mode-cluster.xml",
         "microwave-oven-mode-cluster.xml",
         "door-lock-cluster.xml",
+        "drlc-cluster.xml",
         "electrical-measurement-cluster.xml",
         "ethernet-network-diagnostics-cluster.xml",
         "fan-control-cluster.xml",
@@ -69,6 +71,7 @@
         "operational-credentials-cluster.xml",
         "operational-state-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,8 +101,10 @@
         "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",
@@ -158,7 +163,9 @@
             "SerialNumber",
             "UniqueID",
             "CapabilityMinima",
-            "ProductAppearance"
+            "ProductAppearance",
+            "SpecificationVersion",
+            "MaxPathsPerInvoke"
         ],
         "Bridged Device Basic Information": ["ProductAppearance"],
         "Descriptor": ["ClusterRevision"],
@@ -217,7 +224,6 @@
             "FeatureMap",
             "ThreadMetrics"
         ],
-        "Scenes": ["SceneCount", "RemainingCapacity"],
         "Unit Testing": [
             "struct_attr",
             "nullable_struct",
diff --git a/src/app/zap_cluster_list.json b/src/app/zap_cluster_list.json
index 3fcd38e6db24be..0a30412aaca164 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": [],
@@ -68,6 +69,7 @@
         "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": [],
@@ -104,11 +106,13 @@
         "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": [],
         "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [],
@@ -135,6 +139,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"
@@ -201,6 +206,7 @@
         "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"
         ],
@@ -255,12 +261,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/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/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/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/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 1f233190ceee5e..9c66a57da336c5 100644
--- a/src/controller/data_model/BUILD.gn
+++ b/src/controller/data_model/BUILD.gn
@@ -184,6 +184,8 @@ if (current_os == "android" || matter_enable_java_compilation) {
       "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",
@@ -248,6 +250,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",
@@ -268,7 +272,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 c1e182aec384aa..533767e110f582 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -151,14 +151,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;
+  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;
@@ -390,12 +399,12 @@ 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 {
+  enum MoveModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
 
-  enum StepMode : enum8 {
+  enum StepModeEnum : enum8 {
     kUp = 0;
     kDown = 1;
   }
@@ -406,7 +415,7 @@ client cluster LevelControl = 8 {
     kFrequency = 0x4;
   }
 
-  bitmap LevelControlOptions : bitmap8 {
+  bitmap OptionsBitmap : bitmap8 {
     kExecuteIfOff = 0x1;
     kCoupleColorTempToLevel = 0x2;
   }
@@ -418,7 +427,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;
@@ -435,55 +444,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 {
@@ -921,6 +930,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;
@@ -1151,7 +1162,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;
@@ -1468,12 +1479,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;
   }
 
@@ -1526,6 +1537,7 @@ client cluster NetworkCommissioning = 49 {
     kWiFiNetworkInterface = 0x1;
     kThreadNetworkInterface = 0x2;
     kEthernetNetworkInterface = 0x4;
+    kPerDeviceCredentials = 0x8;
   }
 
   bitmap ThreadCapabilitiesBitmap : bitmap16 {
@@ -1542,11 +1554,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 {
@@ -1603,6 +1618,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 {
@@ -1619,6 +1637,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 {
@@ -1638,6 +1658,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. */
@@ -1650,6 +1680,8 @@ 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. */
@@ -2803,6 +2835,105 @@ client cluster IcdManagement = 70 {
   command access(invoke: manage) StayActiveRequest(): DefaultSuccess = 3;
 }
 
+/** This cluster supports creating a simple timer functionality. */
+provisional client cluster Timer = 71 {
+  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;
+}
+
+/** Attributes and commands for selecting a mode from a list of supported options. */
+provisional client cluster OvenMode = 73 {
+  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;
+}
+
 /** Attributes and commands for selecting a mode from a list of supported options. */
 client cluster ModeSelect = 80 {
   bitmap Feature : bitmap32 {
@@ -3649,6 +3780,314 @@ client cluster ActivatedCarbonFilterMonitoring = 114 {
   command ResetCondition(): DefaultSuccess = 0;
 }
 
+/** This cluster is used to configure a boolean sensor. */
+provisional client cluster BooleanSensorConfiguration = 128 {
+  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 {
+  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. */
+client cluster DemandResponseLoadControl = 150 {
+  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;
+  }
+
+  enum PowerSavingsEnum : enum8 {
+    kLow = 0;
+    kMedium = 1;
+    kHigh = 2;
+  }
+
+  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 {
+    PowerSavingsEnum 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 DeviceClassBitmap deviceClass = 0;
+  readonly attribute LoadControlProgramStruct loadControlPrograms[] = 1;
+  readonly attribute int8u numberOfLoadControlPrograms = 2;
+  readonly attribute LoadControlEventStruct events[] = 3;
+  readonly attribute LoadControlEventStruct activeEvents[] = 4;
+  readonly attribute int8u numberOfEventsPerProgram = 5;
+  readonly attribute int8u numberOfTransistions = 6;
+  attribute access(write: manage) int8u defaultRandomStart = 7;
+  attribute access(write: manage) int8u defaultRandomDuration = 8;
+  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;
+}
+
 /** An interface to a generic way to secure a door */
 client cluster DoorLock = 257 {
   enum AlarmCodeEnum : enum8 {
@@ -4821,9 +5260,28 @@ 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;
+  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;
@@ -5859,7 +6317,8 @@ 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;
+  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;
@@ -5938,7 +6397,7 @@ 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 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kTargetNotFound = 1;
     kNotAllowed = 2;
@@ -5946,7 +6405,7 @@ client cluster TargetNavigator = 1285 {
 
   struct TargetInfoStruct {
     int8u identifier = 0;
-    char_string<32> name = 1;
+    char_string name = 1;
   }
 
   readonly attribute TargetInfoStruct targetList[] = 0;
@@ -5964,7 +6423,7 @@ client cluster TargetNavigator = 1285 {
   }
 
   response struct NavigateTargetResponse = 1 {
-    TargetNavigatorStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
@@ -6215,7 +6674,7 @@ client cluster KeypadInput = 1289 {
     kData = 118;
   }
 
-  enum KeypadInputStatusEnum : enum8 {
+  enum StatusEnum : enum8 {
     kSuccess = 0;
     kUnsupportedKey = 1;
     kInvalidKeyInCurrentState = 2;
@@ -6239,7 +6698,7 @@ client cluster KeypadInput = 1289 {
   }
 
   response struct SendKeyResponse = 1 {
-    KeypadInputStatusEnum status = 0;
+    StatusEnum status = 0;
   }
 
   /** Upon receipt, this SHALL process a keycode as input to the media device. */
@@ -6248,12 +6707,6 @@ 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;
-  }
-
   enum MetricTypeEnum : enum8 {
     kPixels = 0;
     kPercentage = 1;
@@ -6276,12 +6729,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;
   }
@@ -6293,13 +6752,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;
   }
 
@@ -6308,13 +6767,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;
@@ -6323,7 +6782,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;
@@ -6344,7 +6803,7 @@ client cluster ContentLauncher = 1290 {
   }
 
   response struct LauncherResponse = 2 {
-    ContentLaunchStatusEnum status = 0;
+    StatusEnum status = 0;
     optional char_string data = 1;
   }
 
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
index 0a14bd9b68a2c5..bb019d9e11161c 100644
--- a/src/controller/data_model/controller-clusters.zap
+++ b/src/controller/data_model/controller-clusters.zap
@@ -1983,6 +1983,128 @@
             }
           ]
         },
+        {
+          "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": [
+            {
+              "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": "Mode Select",
           "code": 80,
@@ -2608,6 +2730,7 @@
           "define": "MICROWAVE_OVEN_MODE_CLUSTER",
           "side": "client",
           "enabled": 1,
+          "apiMaturity": "provisional",
           "attributes": [
             {
               "name": "FeatureMap",
@@ -4781,58 +4904,6 @@
             }
           ]
         },
-        {
-          "name": "Microwave Oven Control",
-          "code": 1295,
-          "mfgCode": null,
-          "define": "MICROWAVE_OVEN_CONTROL_CLUSTER",
-          "side": "client",
-          "enabled": 1,
-          "commands": [
-            {
-              "name": "SetCookingParameters",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 0,
-              "isEnabled": 1
-            }
-          ],
-          "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": "Electrical Measurement",
           "code": 2820,
@@ -5175,5 +5246,6 @@
       "endpointId": 1,
       "networkId": 0
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
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/BUILD.gn b/src/controller/java/BUILD.gn
index 01617c1f9e50b8..4d09f611bc4267 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -80,22 +80,6 @@ shared_library("jni") {
     ]
   }
 
-  if (matter_enable_java_generated_api) {
-    sources += [
-      "CHIPDefaultCallbacks.cpp",
-      "CHIPDefaultCallbacks.h",
-      "zap-generated/CHIPClustersWrite-JNI.cpp",
-      "zap-generated/CHIPInvokeCallbacks.cpp",
-      "zap-generated/CHIPInvokeCallbacks.h",
-      "zap-generated/CHIPReadCallbacks.cpp",
-    ]
-
-    deps += [
-      "${chip_root}/src/controller/data_model",
-      "${chip_root}/src/controller/data_model:java-jni-sources",
-    ]
-  }
-
   if (chip_build_controller_dynamic_server) {
     sources += [
       "BdxOTASender.cpp",
@@ -481,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",
@@ -505,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/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
index a7443852d8a678..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 {
@@ -2092,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)
@@ -2141,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)));
@@ -2201,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;
@@ -2210,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)
@@ -2222,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;
@@ -2295,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;
@@ -2461,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;
@@ -2745,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/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java
index 04f8ae801534e4..239e80a9272419 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,32529 +173,57738 @@ 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);
+      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(chipClusterPtr, callback, null);
+      timeSnapshot(callback, 0);
     }
 
     public void timeSnapshot(TimeSnapshotResponseCallback callback, int timedInvokeTimeoutMs) {
-      timeSnapshot(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
-
-    private native void testEventTrigger(long chipClusterPtr, DefaultClusterCallback callback, byte[] enableKey, Long eventTrigger, @Nullable Integer timedInvokeTimeoutMs);
-
-    private native void timeSnapshot(long chipClusterPtr, TimeSnapshotResponseCallback callback, @Nullable Integer timedInvokeTimeoutMs);
-
-    public interface TimeSnapshotResponseCallback {
+      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);
-      void onError(Exception error);
     }
 
-    public interface NetworkInterfacesAttributeCallback {
+    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);
+
+      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 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);
-
-    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 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);
-
-    private native void readParentChangeCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeParentChangeCountAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    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);
-
-    private native void readCurrentMaxRateAttribute(long chipClusterPtr, CurrentMaxRateAttributeCallback callback);
-
-    private native void subscribeCurrentMaxRateAttribute(long chipClusterPtr, CurrentMaxRateAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    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);
-
-    private native void readCarrierDetectAttribute(long chipClusterPtr, CarrierDetectAttributeCallback callback);
-
-    private native void subscribeCarrierDetectAttribute(long chipClusterPtr, CarrierDetectAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    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);
-
-    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);
+      final long commandId = 5L;
 
-    private native void setDSTOffset(long chipClusterPtr, DefaultClusterCallback callback, ArrayList<ChipStructs.TimeSynchronizationClusterDSTOffsetStruct> DSTOffset, @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 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);
-
-    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 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);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    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 {
-      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);
+      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 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);
+      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 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);
-
-    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);
+      final long commandId = 11L;
 
-    private native void updateFabricLabel(long chipClusterPtr, NOCResponseCallback callback, String label, @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 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);
+      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 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);
+      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 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);
+      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 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);
+      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 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);
-
-    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 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);
-    }
+      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 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);
+      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 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);
+      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 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);
+      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(DefaultClusterCallback callback) {
-      stayActiveRequest(chipClusterPtr, callback, null);
+      stayActiveRequest(callback, 0);
     }
 
     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);
+      final long commandId = 3L;
 
-    private native void stayActiveRequest(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 RegisterClientResponseCallback {
+    public interface RegisterClientResponseCallback extends BaseClusterCallback {
       void onSuccess(Long ICDCounter);
-      void onError(Exception error);
     }
 
-    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) {}
+      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 AttributeListAttributeCallback {
-      void onSuccess(List<Long> 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);
+
+      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 readDescriptionAttribute(
-        CharStringAttributeCallback callback) {
-        readDescriptionAttribute(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 subscribeDescriptionAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDescriptionAttribute(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 readStandardNamespaceAttribute(
-        StandardNamespaceAttributeCallback callback) {
-        readStandardNamespaceAttribute(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 subscribeStandardNamespaceAttribute(
-        StandardNamespaceAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStandardNamespaceAttribute(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 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) {
+      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) {
+      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 OvenModeCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 73L;
+
+    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
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
+
+    public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode) {
+      changeToMode(callback, newMode, 0);
+    }
+
+    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 interface SupportedModesAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.OvenModeClusterModeOptionStruct> value);
+    }
+
+    public interface StartUpModeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
+
+    public interface OnModeAttributeCallback 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 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);
-    }
-
-    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);
+      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 LaundryWasherModeCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 81L;
+  public static class ModeSelectCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 80L;
 
-    public LaundryWasherModeCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    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;
+
+    public ModeSelectCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
     @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode) {
-      changeToMode(chipClusterPtr, callback, newMode, null);
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void changeToMode(ChangeToModeResponseCallback callback, Integer newMode, int timedInvokeTimeoutMs) {
-      changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs);
+    public void changeToMode(DefaultClusterCallback callback, Integer newMode) {
+      changeToMode(callback, newMode, 0);
     }
 
-    private native void changeToMode(long chipClusterPtr, ChangeToModeResponseCallback callback, Integer newMode, @Nullable Integer timedInvokeTimeoutMs);
+    public void changeToMode(DefaultClusterCallback 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));
 
-    public interface ChangeToModeResponseCallback {
-      void onSuccess(Integer status, Optional<String> statusText);
-      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 SupportedModesAttributeCallback {
-      void onSuccess(List<ChipStructs.LaundryWasherModeClusterModeOptionStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface StandardNamespaceAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public interface StartUpModeAttributeCallback {
+    public interface SupportedModesAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.ModeSelectClusterModeOptionStruct> value);
+    }
+
+    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 readDescriptionAttribute(
+        CharStringAttributeCallback 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) {
+      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 readStandardNamespaceAttribute(
+        StandardNamespaceAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STANDARD_NAMESPACE_ATTRIBUTE_ID);
+
+      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 void subscribeStandardNamespaceAttribute(
+        StandardNamespaceAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, STANDARD_NAMESPACE_ATTRIBUTE_ID);
+
+      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) {
-        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);
-    }
-
-    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);
-
-    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 LaundryWasherModeCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 81L;
 
-    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 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);
-    }
-
-    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.LaundryWasherModeClusterModeOptionStruct> 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.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) {
-        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);
+
+      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 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.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct> value);
+    }
 
-    private native void readOnModeAttribute(long chipClusterPtr, OnModeAttributeCallback callback);
+    public interface StartUpModeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void writeOnModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public interface OnModeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    private native void subscribeOnModeAttribute(long chipClusterPtr, OnModeAttributeCallback callback, int minInterval, int maxInterval);
+    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 readSupportedModesAttribute(
+        SupportedModesAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void subscribeSupportedModesAttribute(
+        SupportedModesAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_MODES_ATTRIBUTE_ID);
+
+      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 void readCurrentModeAttribute(
+        IntegerAttributeCallback 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) {
+      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) {
+      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(callback, value, 0);
+    }
+
+    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 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) {
+      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) {
+      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) {
+      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) {
+      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) {
+      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);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    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);
+    }
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    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);
+    }
 
-    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 LaundryWasherControlsCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 83L;
 
+    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;
+
     public LaundryWasherControlsCluster(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 SpinSpeedsAttributeCallback {
+    public interface SpinSpeedsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<String> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface SpinSpeedCurrentAttributeCallback {
+    public interface SpinSpeedCurrentAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface SupportedRinsesAttributeCallback {
+    public interface SupportedRinsesAttributeCallback 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 readSpinSpeedsAttribute(
         SpinSpeedsAttributeCallback callback) {
-        readSpinSpeedsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPIN_SPEEDS_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeSpinSpeedsAttribute(
         SpinSpeedsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSpinSpeedsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPIN_SPEEDS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            List<String> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SPIN_SPEEDS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSpinSpeedCurrentAttribute(
         SpinSpeedCurrentAttributeCallback callback) {
-        readSpinSpeedCurrentAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPIN_SPEED_CURRENT_ATTRIBUTE_ID);
+
+      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 void writeSpinSpeedCurrentAttribute(DefaultClusterCallback callback, Integer value) {
-        writeSpinSpeedCurrentAttribute(chipClusterPtr, callback, value, null);
+      writeSpinSpeedCurrentAttribute(callback, value, 0);
     }
 
     public void writeSpinSpeedCurrentAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeSpinSpeedCurrentAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), SPIN_SPEED_CURRENT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeSpinSpeedCurrentAttribute(
         SpinSpeedCurrentAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSpinSpeedCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPIN_SPEED_CURRENT_ATTRIBUTE_ID);
+
+      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 void readNumberOfRinsesAttribute(
         IntegerAttributeCallback callback) {
-        readNumberOfRinsesAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_RINSES_ATTRIBUTE_ID);
+
+      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 void writeNumberOfRinsesAttribute(DefaultClusterCallback callback, Integer value) {
-        writeNumberOfRinsesAttribute(chipClusterPtr, callback, value, null);
+      writeNumberOfRinsesAttribute(callback, value, 0);
     }
 
     public void writeNumberOfRinsesAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeNumberOfRinsesAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), NUMBER_OF_RINSES_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeNumberOfRinsesAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfRinsesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_RINSES_ATTRIBUTE_ID);
+
+      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 readSupportedRinsesAttribute(
         SupportedRinsesAttributeCallback callback) {
-        readSupportedRinsesAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_RINSES_ATTRIBUTE_ID);
+
+      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 subscribeSupportedRinsesAttribute(
         SupportedRinsesAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedRinsesAttribute(chipClusterPtr, callback, minInterval, 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 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);
+      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 RvcRunModeCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 84L;
 
+    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);
+      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 {
+    public interface SupportedModesAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.RvcRunModeClusterModeOptionStruct> 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.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);
+      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 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);
-
-    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 RvcCleanModeCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 85L;
 
+    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 RvcCleanModeCluster(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 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 {
+    public interface SupportedModesAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.RvcCleanModeClusterModeOptionStruct> 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.RvcCleanModeClusterModeOptionStruct> 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.RvcCleanModeClusterModeOptionStruct> 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 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);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    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 TemperatureControlCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 86L;
 
+    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;
+
     public TemperatureControlCluster(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 setTemperature(DefaultClusterCallback callback, Optional<Integer> targetTemperature, Optional<Integer> targetTemperatureLevel) {
-      setTemperature(chipClusterPtr, callback, targetTemperature, targetTemperatureLevel, null);
+      setTemperature(callback, targetTemperature, targetTemperatureLevel, 0);
     }
 
     public void setTemperature(DefaultClusterCallback callback, Optional<Integer> targetTemperature, Optional<Integer> targetTemperatureLevel, int timedInvokeTimeoutMs) {
-      setTemperature(chipClusterPtr, callback, targetTemperature, targetTemperatureLevel, timedInvokeTimeoutMs);
-    }
+      final long commandId = 0L;
+
+      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));
+
+      final long targetTemperatureLevelFieldID = 1L;
+      BaseTLVType targetTemperatureLeveltlvValue = targetTemperatureLevel.<BaseTLVType>map((nonOptionaltargetTemperatureLevel) -> new UIntType(nonOptionaltargetTemperatureLevel)).orElse(new EmptyType());
+      elements.add(new StructElement(targetTemperatureLevelFieldID, targetTemperatureLeveltlvValue));
 
-    private native void setTemperature(long chipClusterPtr, DefaultClusterCallback callback, Optional<Integer> targetTemperature, Optional<Integer> targetTemperatureLevel, @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 SupportedTemperatureLevelsAttributeCallback {
+    public interface SupportedTemperatureLevelsAttributeCallback 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 readTemperatureSetpointAttribute(
         IntegerAttributeCallback callback) {
-        readTemperatureSetpointAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEMPERATURE_SETPOINT_ATTRIBUTE_ID);
+
+      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 subscribeTemperatureSetpointAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTemperatureSetpointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEMPERATURE_SETPOINT_ATTRIBUTE_ID);
+
+      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 readMinTemperatureAttribute(
         IntegerAttributeCallback callback) {
-        readMinTemperatureAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_TEMPERATURE_ATTRIBUTE_ID);
+
+      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 subscribeMinTemperatureAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_TEMPERATURE_ATTRIBUTE_ID);
+
+      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 readMaxTemperatureAttribute(
         IntegerAttributeCallback callback) {
-        readMaxTemperatureAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_TEMPERATURE_ATTRIBUTE_ID);
+
+      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 subscribeMaxTemperatureAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxTemperatureAttribute(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 readStepAttribute(
         IntegerAttributeCallback callback) {
-        readStepAttribute(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 subscribeStepAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStepAttribute(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 readSelectedTemperatureLevelAttribute(
         IntegerAttributeCallback callback) {
-        readSelectedTemperatureLevelAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SELECTED_TEMPERATURE_LEVEL_ATTRIBUTE_ID);
+
+      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 subscribeSelectedTemperatureLevelAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSelectedTemperatureLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SELECTED_TEMPERATURE_LEVEL_ATTRIBUTE_ID);
+
+      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 readSupportedTemperatureLevelsAttribute(
         SupportedTemperatureLevelsAttributeCallback callback) {
-        readSupportedTemperatureLevelsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_TEMPERATURE_LEVELS_ATTRIBUTE_ID);
+
+      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 subscribeSupportedTemperatureLevelsAttribute(
         SupportedTemperatureLevelsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedTemperatureLevelsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_TEMPERATURE_LEVELS_ATTRIBUTE_ID);
+
+      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 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);
+      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 RefrigeratorAlarmCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 87L;
 
+    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 RefrigeratorAlarmCluster(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 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);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MASK_ATTRIBUTE_ID);
+
+      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 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);
+      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 DishwasherModeCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 89L;
 
+    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);
+      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 {
+    public interface SupportedModesAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.DishwasherModeClusterModeOptionStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    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.DishwasherModeClusterModeOptionStruct> 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.DishwasherModeClusterModeOptionStruct> 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);
-    }
-
-    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);
+      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 AirQualityCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 91L;
 
+    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;
+
     public AirQualityCluster(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 readAirQualityAttribute(
         IntegerAttributeCallback callback) {
-        readAirQualityAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AIR_QUALITY_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeAirQualityAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAirQualityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AIR_QUALITY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, AIR_QUALITY_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);
-
-    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);
+      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 SmokeCoAlarmCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 92L;
 
+    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 SmokeCoAlarmCluster(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 selfTestRequest(DefaultClusterCallback callback) {
-      selfTestRequest(chipClusterPtr, callback, null);
+      selfTestRequest(callback, 0);
     }
 
     public void selfTestRequest(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      selfTestRequest(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+      final long commandId = 0L;
 
-    private native void selfTestRequest(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 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(
         IntegerAttributeCallback callback) {
-        readExpressedStateAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EXPRESSED_STATE_ATTRIBUTE_ID);
+
+      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 subscribeExpressedStateAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeExpressedStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EXPRESSED_STATE_ATTRIBUTE_ID);
+
+      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 readSmokeStateAttribute(
         IntegerAttributeCallback callback) {
-        readSmokeStateAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SMOKE_STATE_ATTRIBUTE_ID);
+
+      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 subscribeSmokeStateAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSmokeStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SMOKE_STATE_ATTRIBUTE_ID);
+
+      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 readCOStateAttribute(
         IntegerAttributeCallback callback) {
-        readCOStateAttribute(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 subscribeCOStateAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCOStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, C_O_STATE_ATTRIBUTE_ID);
+
+      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 readBatteryAlertAttribute(
         IntegerAttributeCallback callback) {
-        readBatteryAlertAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BATTERY_ALERT_ATTRIBUTE_ID);
+
+      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 subscribeBatteryAlertAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBatteryAlertAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BATTERY_ALERT_ATTRIBUTE_ID);
+
+      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 readDeviceMutedAttribute(
         IntegerAttributeCallback callback) {
-        readDeviceMutedAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEVICE_MUTED_ATTRIBUTE_ID);
+
+      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 subscribeDeviceMutedAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDeviceMutedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEVICE_MUTED_ATTRIBUTE_ID);
+
+      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 readTestInProgressAttribute(
         BooleanAttributeCallback callback) {
-        readTestInProgressAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEST_IN_PROGRESS_ATTRIBUTE_ID);
+
+      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 subscribeTestInProgressAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTestInProgressAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEST_IN_PROGRESS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TEST_IN_PROGRESS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readHardwareFaultAlertAttribute(
         BooleanAttributeCallback callback) {
-        readHardwareFaultAlertAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, HARDWARE_FAULT_ALERT_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeHardwareFaultAlertAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeHardwareFaultAlertAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, HARDWARE_FAULT_ALERT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, HARDWARE_FAULT_ALERT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readEndOfServiceAlertAttribute(
         IntegerAttributeCallback callback) {
-        readEndOfServiceAlertAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, END_OF_SERVICE_ALERT_ATTRIBUTE_ID);
+
+      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 void subscribeEndOfServiceAlertAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEndOfServiceAlertAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, END_OF_SERVICE_ALERT_ATTRIBUTE_ID);
+
+      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 void readInterconnectSmokeAlarmAttribute(
         IntegerAttributeCallback callback) {
-        readInterconnectSmokeAlarmAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INTERCONNECT_SMOKE_ALARM_ATTRIBUTE_ID);
+
+      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 void subscribeInterconnectSmokeAlarmAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInterconnectSmokeAlarmAttribute(chipClusterPtr, callback, minInterval, 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 readInterconnectCOAlarmAttribute(
         IntegerAttributeCallback callback) {
-        readInterconnectCOAlarmAttribute(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 subscribeInterconnectCOAlarmAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInterconnectCOAlarmAttribute(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 readContaminationStateAttribute(
         IntegerAttributeCallback callback) {
-        readContaminationStateAttribute(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 subscribeContaminationStateAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeContaminationStateAttribute(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 readSmokeSensitivityLevelAttribute(
         IntegerAttributeCallback callback) {
-        readSmokeSensitivityLevelAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SMOKE_SENSITIVITY_LEVEL_ATTRIBUTE_ID);
+
+      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 writeSmokeSensitivityLevelAttribute(DefaultClusterCallback callback, Integer value) {
-        writeSmokeSensitivityLevelAttribute(chipClusterPtr, callback, value, null);
+      writeSmokeSensitivityLevelAttribute(callback, value, 0);
     }
 
     public void writeSmokeSensitivityLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeSmokeSensitivityLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), SMOKE_SENSITIVITY_LEVEL_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeSmokeSensitivityLevelAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSmokeSensitivityLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SMOKE_SENSITIVITY_LEVEL_ATTRIBUTE_ID);
+
+      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 readExpiryDateAttribute(
         LongAttributeCallback callback) {
-        readExpiryDateAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EXPIRY_DATE_ATTRIBUTE_ID);
+
+      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 subscribeExpiryDateAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeExpiryDateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EXPIRY_DATE_ATTRIBUTE_ID);
+
+      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 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);
+      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 DishwasherAlarmCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 93L;
 
+    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;
+
     public DishwasherAlarmCluster(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 reset(DefaultClusterCallback callback, Long alarms) {
-      reset(chipClusterPtr, callback, alarms, null);
+      reset(callback, alarms, 0);
     }
 
     public void reset(DefaultClusterCallback callback, Long alarms, int timedInvokeTimeoutMs) {
-      reset(chipClusterPtr, callback, alarms, timedInvokeTimeoutMs);
+      final long commandId = 0L;
+
+      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 modifyEnabledAlarms(DefaultClusterCallback callback, Long mask) {
-      modifyEnabledAlarms(chipClusterPtr, callback, mask, null);
+      modifyEnabledAlarms(callback, mask, 0);
     }
 
     public void modifyEnabledAlarms(DefaultClusterCallback callback, Long mask, int timedInvokeTimeoutMs) {
-      modifyEnabledAlarms(chipClusterPtr, callback, mask, timedInvokeTimeoutMs);
-    }
+      final long commandId = 1L;
 
-    private native void reset(long chipClusterPtr, DefaultClusterCallback callback, Long alarms, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long maskFieldID = 0L;
+      BaseTLVType masktlvValue = new UIntType(mask);
+      elements.add(new StructElement(maskFieldID, masktlvValue));
 
-    private native void modifyEnabledAlarms(long chipClusterPtr, DefaultClusterCallback callback, Long mask, @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 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);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MASK_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MASK_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readLatchAttribute(
         LongAttributeCallback callback) {
-        readLatchAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LATCH_ATTRIBUTE_ID);
+
+      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 subscribeLatchAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLatchAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LATCH_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LATCH_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);
-
-    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);
+      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 MicrowaveOvenModeCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 94L;
 
+    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;
+
     public MicrowaveOvenModeCluster(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 SupportedModesAttributeCallback {
+    public interface SupportedModesAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.MicrowaveOvenModeClusterModeOptionStruct> 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.MicrowaveOvenModeClusterModeOptionStruct> 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.MicrowaveOvenModeClusterModeOptionStruct> 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 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 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 MicrowaveOvenControlCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 95L;
 
+    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 MicrowaveOvenControlCluster(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 setCookingParameters(DefaultClusterCallback callback, Optional<Integer> cookMode, Optional<Long> cookTime, Optional<Integer> powerSetting) {
-      setCookingParameters(chipClusterPtr, callback, cookMode, cookTime, powerSetting, null);
+      setCookingParameters(callback, cookMode, cookTime, powerSetting, 0);
     }
 
     public void setCookingParameters(DefaultClusterCallback callback, Optional<Integer> cookMode, Optional<Long> cookTime, Optional<Integer> powerSetting, int timedInvokeTimeoutMs) {
-      setCookingParameters(chipClusterPtr, callback, cookMode, cookTime, powerSetting, timedInvokeTimeoutMs);
+      final long commandId = 0L;
+
+      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));
+
+      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));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void addMoreTime(DefaultClusterCallback callback, Long timeToAdd) {
-      addMoreTime(chipClusterPtr, callback, timeToAdd, null);
+      addMoreTime(callback, timeToAdd, 0);
     }
 
     public void addMoreTime(DefaultClusterCallback callback, Long timeToAdd, int timedInvokeTimeoutMs) {
-      addMoreTime(chipClusterPtr, callback, timeToAdd, timedInvokeTimeoutMs);
-    }
+      final long commandId = 1L;
 
-    private native void setCookingParameters(long chipClusterPtr, DefaultClusterCallback callback, Optional<Integer> cookMode, Optional<Long> cookTime, Optional<Integer> powerSetting, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long timeToAddFieldID = 0L;
+      BaseTLVType timeToAddtlvValue = new UIntType(timeToAdd);
+      elements.add(new StructElement(timeToAddFieldID, timeToAddtlvValue));
 
-    private native void addMoreTime(long chipClusterPtr, DefaultClusterCallback callback, Long timeToAdd, @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 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 readCookTimeAttribute(
         LongAttributeCallback callback) {
-        readCookTimeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COOK_TIME_ATTRIBUTE_ID);
+
+      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) {
-        subscribeCookTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COOK_TIME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, COOK_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPowerSettingAttribute(
         IntegerAttributeCallback callback) {
-        readPowerSettingAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_SETTING_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribePowerSettingAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePowerSettingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_SETTING_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, POWER_SETTING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMinPowerAttribute(
         IntegerAttributeCallback callback) {
-        readMinPowerAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_POWER_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeMinPowerAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinPowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_POWER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_POWER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readMaxPowerAttribute(
         IntegerAttributeCallback callback) {
-        readMaxPowerAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_POWER_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeMaxPowerAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxPowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_POWER_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_POWER_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPowerStepAttribute(
         IntegerAttributeCallback callback) {
-        readPowerStepAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_STEP_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribePowerStepAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePowerStepAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_STEP_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, POWER_STEP_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 readCookTimeAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void subscribeCookTimeAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPowerSettingAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribePowerSettingAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMinPowerAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMinPowerAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readMaxPowerAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMaxPowerAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readPowerStepAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribePowerStepAttribute(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 OperationalStateCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 96L;
 
+    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 OperationalStateCluster(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 pause(OperationalCommandResponseCallback callback) {
-      pause(chipClusterPtr, callback, null);
+      pause(callback, 0);
     }
 
     public void pause(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
-      pause(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) {
+          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 stop(OperationalCommandResponseCallback callback) {
-      stop(chipClusterPtr, callback, null);
+      stop(callback, 0);
     }
 
     public void stop(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
-      stop(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) {
+          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 start(OperationalCommandResponseCallback callback) {
-      start(chipClusterPtr, callback, null);
+      start(callback, 0);
     }
 
     public void start(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
-      start(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) {
+          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 resume(OperationalCommandResponseCallback callback) {
-      resume(chipClusterPtr, callback, null);
+      resume(callback, 0);
     }
 
     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 {
+      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);
-      void onError(Exception error);
     }
 
-    public interface PhaseListAttributeCallback {
+    public interface PhaseListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable List<String> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface CurrentPhaseAttributeCallback {
+    public interface CurrentPhaseAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface CountdownTimeAttributeCallback {
+    public interface CountdownTimeAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface OperationalStateListAttributeCallback {
+    public interface OperationalStateListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.OperationalStateClusterOperationalStateStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface OperationalErrorAttributeCallback {
+    public interface OperationalErrorAttributeCallback extends BaseAttributeCallback {
       void onSuccess(ChipStructs.OperationalStateClusterErrorStateStruct 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 readPhaseListAttribute(
         PhaseListAttributeCallback callback) {
-        readPhaseListAttribute(chipClusterPtr, 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 subscribePhaseListAttribute(
         PhaseListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePhaseListAttribute(chipClusterPtr, callback, minInterval, 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 readCurrentPhaseAttribute(
         CurrentPhaseAttributeCallback callback) {
-        readCurrentPhaseAttribute(chipClusterPtr, 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 subscribeCurrentPhaseAttribute(
         CurrentPhaseAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentPhaseAttribute(chipClusterPtr, callback, minInterval, 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 readCountdownTimeAttribute(
         CountdownTimeAttributeCallback callback) {
-        readCountdownTimeAttribute(chipClusterPtr, 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 subscribeCountdownTimeAttribute(
         CountdownTimeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCountdownTimeAttribute(chipClusterPtr, callback, minInterval, 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 readOperationalStateListAttribute(
         OperationalStateListAttributeCallback callback) {
-        readOperationalStateListAttribute(chipClusterPtr, 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.OperationalStateClusterOperationalStateStruct> value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, OPERATIONAL_STATE_LIST_ATTRIBUTE_ID, true);
     }
 
     public void subscribeOperationalStateListAttribute(
         OperationalStateListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOperationalStateListAttribute(chipClusterPtr, callback, minInterval, 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 readOperationalStateAttribute(
         IntegerAttributeCallback callback) {
-        readOperationalStateAttribute(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 subscribeOperationalStateAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOperationalStateAttribute(chipClusterPtr, callback, minInterval, 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 readOperationalErrorAttribute(
         OperationalErrorAttributeCallback callback) {
-        readOperationalErrorAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_ERROR_ATTRIBUTE_ID);
+
+      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 subscribeOperationalErrorAttribute(
         OperationalErrorAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOperationalErrorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_ERROR_ATTRIBUTE_ID);
+
+      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 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);
-
-    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);
+      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 RvcOperationalStateCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 97L;
 
+    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 RvcOperationalStateCluster(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 pause(OperationalCommandResponseCallback callback) {
-      pause(chipClusterPtr, callback, null);
+      pause(callback, 0);
     }
 
     public void pause(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
-      pause(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) {
+          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 stop(OperationalCommandResponseCallback callback) {
-      stop(chipClusterPtr, callback, null);
+      stop(callback, 0);
     }
 
     public void stop(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
-      stop(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) {
+          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 start(OperationalCommandResponseCallback callback) {
-      start(chipClusterPtr, callback, null);
+      start(callback, 0);
     }
 
     public void start(OperationalCommandResponseCallback callback, int timedInvokeTimeoutMs) {
-      start(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) {
+          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 resume(OperationalCommandResponseCallback callback) {
-      resume(chipClusterPtr, callback, null);
+      resume(callback, 0);
     }
 
     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 {
+      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);
-      void onError(Exception error);
     }
 
-    public interface PhaseListAttributeCallback {
+    public interface PhaseListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable List<String> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface CurrentPhaseAttributeCallback {
+    public interface CurrentPhaseAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface CountdownTimeAttributeCallback {
+    public interface CountdownTimeAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface OperationalStateListAttributeCallback {
+    public interface OperationalStateListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.RvcOperationalStateClusterOperationalStateStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface OperationalErrorAttributeCallback {
+    public interface OperationalErrorAttributeCallback extends BaseAttributeCallback {
       void onSuccess(ChipStructs.RvcOperationalStateClusterErrorStateStruct 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 readPhaseListAttribute(
         PhaseListAttributeCallback callback) {
-        readPhaseListAttribute(chipClusterPtr, 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 subscribePhaseListAttribute(
         PhaseListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePhaseListAttribute(chipClusterPtr, callback, minInterval, 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 readCurrentPhaseAttribute(
         CurrentPhaseAttributeCallback callback) {
-        readCurrentPhaseAttribute(chipClusterPtr, 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 subscribeCurrentPhaseAttribute(
         CurrentPhaseAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentPhaseAttribute(chipClusterPtr, callback, minInterval, 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 readCountdownTimeAttribute(
         CountdownTimeAttributeCallback callback) {
-        readCountdownTimeAttribute(chipClusterPtr, 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 subscribeCountdownTimeAttribute(
         CountdownTimeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCountdownTimeAttribute(chipClusterPtr, callback, minInterval, 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 readOperationalStateListAttribute(
         OperationalStateListAttributeCallback callback) {
-        readOperationalStateListAttribute(chipClusterPtr, 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 subscribeOperationalStateListAttribute(
         OperationalStateListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOperationalStateListAttribute(chipClusterPtr, callback, minInterval, 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 readOperationalStateAttribute(
         IntegerAttributeCallback callback) {
-        readOperationalStateAttribute(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 subscribeOperationalStateAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOperationalStateAttribute(chipClusterPtr, callback, minInterval, 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 readOperationalErrorAttribute(
         OperationalErrorAttributeCallback callback) {
-        readOperationalErrorAttribute(chipClusterPtr, 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 subscribeOperationalErrorAttribute(
         OperationalErrorAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOperationalErrorAttribute(chipClusterPtr, callback, minInterval, 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);
-    }
-
-    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);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    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);
+      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 HepaFilterMonitoringCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 113L;
 
+    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;
+
     public HepaFilterMonitoringCluster(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 resetCondition(DefaultClusterCallback callback) {
-      resetCondition(chipClusterPtr, callback, null);
+      resetCondition(callback, 0);
     }
 
     public void resetCondition(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      resetCondition(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+      final long commandId = 0L;
 
-    private native void resetCondition(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 LastChangedTimeAttributeCallback {
+    public interface LastChangedTimeAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ReplacementProductListAttributeCallback {
+    public interface ReplacementProductListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.HepaFilterMonitoringClusterReplacementProductStruct> 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 readConditionAttribute(
         IntegerAttributeCallback callback) {
-        readConditionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONDITION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CONDITION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeConditionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeConditionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONDITION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CONDITION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readDegradationDirectionAttribute(
         IntegerAttributeCallback callback) {
-        readDegradationDirectionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEGRADATION_DIRECTION_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeDegradationDirectionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDegradationDirectionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEGRADATION_DIRECTION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DEGRADATION_DIRECTION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readChangeIndicationAttribute(
         IntegerAttributeCallback callback) {
-        readChangeIndicationAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHANGE_INDICATION_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeChangeIndicationAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeChangeIndicationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHANGE_INDICATION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CHANGE_INDICATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readInPlaceIndicatorAttribute(
         BooleanAttributeCallback callback) {
-        readInPlaceIndicatorAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, IN_PLACE_INDICATOR_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeInPlaceIndicatorAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInPlaceIndicatorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, IN_PLACE_INDICATOR_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, IN_PLACE_INDICATOR_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readLastChangedTimeAttribute(
         LastChangedTimeAttributeCallback callback) {
-        readLastChangedTimeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_CHANGED_TIME_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void writeLastChangedTimeAttribute(DefaultClusterCallback callback, Long value) {
-        writeLastChangedTimeAttribute(chipClusterPtr, callback, value, null);
+      writeLastChangedTimeAttribute(callback, value, 0);
     }
 
     public void writeLastChangedTimeAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeLastChangedTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LAST_CHANGED_TIME_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeLastChangedTimeAttribute(
         LastChangedTimeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLastChangedTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_CHANGED_TIME_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void readReplacementProductListAttribute(
         ReplacementProductListAttributeCallback callback) {
-        readReplacementProductListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REPLACEMENT_PRODUCT_LIST_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeReplacementProductListAttribute(
         ReplacementProductListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeReplacementProductListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REPLACEMENT_PRODUCT_LIST_ATTRIBUTE_ID);
+
+      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);
     }
 
     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 readConditionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  public static class ActivatedCarbonFilterMonitoringCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 114L;
 
-    private native void subscribeConditionAttribute(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 readDegradationDirectionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public ActivatedCarbonFilterMonitoringCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    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 = 114L;
-
-    public ActivatedCarbonFilterMonitoringCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
-
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void resetCondition(DefaultClusterCallback callback) {
-      resetCondition(chipClusterPtr, callback, null);
+      resetCondition(callback, 0);
     }
 
     public void resetCondition(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      resetCondition(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+      final long commandId = 0L;
 
-    private native void resetCondition(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 LastChangedTimeAttributeCallback {
+    public interface LastChangedTimeAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ReplacementProductListAttributeCallback {
+    public interface ReplacementProductListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.ActivatedCarbonFilterMonitoringClusterReplacementProductStruct> 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 readConditionAttribute(
         IntegerAttributeCallback callback) {
-        readConditionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONDITION_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, CONDITION_ATTRIBUTE_ID, true);
     }
 
     public void subscribeConditionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeConditionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONDITION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CONDITION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readDegradationDirectionAttribute(
         IntegerAttributeCallback callback) {
-        readDegradationDirectionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEGRADATION_DIRECTION_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeDegradationDirectionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDegradationDirectionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEGRADATION_DIRECTION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DEGRADATION_DIRECTION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readChangeIndicationAttribute(
         IntegerAttributeCallback callback) {
-        readChangeIndicationAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHANGE_INDICATION_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeChangeIndicationAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeChangeIndicationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CHANGE_INDICATION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CHANGE_INDICATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readInPlaceIndicatorAttribute(
         BooleanAttributeCallback callback) {
-        readInPlaceIndicatorAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, IN_PLACE_INDICATOR_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeInPlaceIndicatorAttribute(
         BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInPlaceIndicatorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, IN_PLACE_INDICATOR_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, IN_PLACE_INDICATOR_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readLastChangedTimeAttribute(
         LastChangedTimeAttributeCallback callback) {
-        readLastChangedTimeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_CHANGED_TIME_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void writeLastChangedTimeAttribute(DefaultClusterCallback callback, Long value) {
-        writeLastChangedTimeAttribute(chipClusterPtr, callback, value, null);
+      writeLastChangedTimeAttribute(callback, value, 0);
     }
 
     public void writeLastChangedTimeAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeLastChangedTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LAST_CHANGED_TIME_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeLastChangedTimeAttribute(
         LastChangedTimeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLastChangedTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAST_CHANGED_TIME_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void readReplacementProductListAttribute(
         ReplacementProductListAttributeCallback callback) {
-        readReplacementProductListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REPLACEMENT_PRODUCT_LIST_ATTRIBUTE_ID);
+
+      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 void subscribeReplacementProductListAttribute(
         ReplacementProductListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeReplacementProductListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REPLACEMENT_PRODUCT_LIST_ATTRIBUTE_ID);
+
+      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);
     }
 
     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);
-
-    private native void subscribeInPlaceIndicatorAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    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);
+      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 readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+  public static class BooleanSensorConfigurationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 128L;
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    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;
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public BooleanSensorConfigurationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void suppressRequest(DefaultClusterCallback callback, Integer alarmsToSuppress) {
+      suppressRequest(callback, alarmsToSuppress, 0);
+    }
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+    public void suppressRequest(DefaultClusterCallback callback, Integer alarmsToSuppress, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long alarmsToSuppressFieldID = 0L;
+      BaseTLVType alarmsToSuppresstlvValue = new UIntType(alarmsToSuppress);
+      elements.add(new StructElement(alarmsToSuppressFieldID, alarmsToSuppresstlvValue));
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback 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 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 DoorLockCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 257L;
+    public void readSensitivityLevelAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SENSITIVITY_LEVEL_ATTRIBUTE_ID);
 
-    public DoorLockCluster(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);
+          }
+        }, SENSITIVITY_LEVEL_ATTRIBUTE_ID, true);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
+    public void writeSensitivityLevelAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSensitivityLevelAttribute(callback, value, 0);
+    }
 
-    public void lockDoor(DefaultClusterCallback callback, Optional<byte[]> PINCode, int timedInvokeTimeoutMs) {
-      lockDoor(chipClusterPtr, callback, PINCode, timedInvokeTimeoutMs);
+    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 subscribeSensitivityLevelAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SENSITIVITY_LEVEL_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) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SENSITIVITY_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
+    public void readAlarmsActiveAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALARMS_ACTIVE_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) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ALARMS_ACTIVE_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 subscribeAlarmsActiveAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALARMS_ACTIVE_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) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ALARMS_ACTIVE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void getWeekDaySchedule(GetWeekDayScheduleResponseCallback callback, Integer weekDayIndex, Integer userIndex) {
-      getWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, null);
-    }
+    public void readAlarmsSuppressedAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALARMS_SUPPRESSED_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) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ALARMS_SUPPRESSED_ATTRIBUTE_ID, true);
     }
 
-    public void clearWeekDaySchedule(DefaultClusterCallback callback, Integer weekDayIndex, Integer userIndex) {
-      clearWeekDaySchedule(chipClusterPtr, callback, weekDayIndex, userIndex, null);
-    }
+    public void subscribeAlarmsSuppressedAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALARMS_SUPPRESSED_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) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ALARMS_SUPPRESSED_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 readAlarmsEnabledAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALARMS_ENABLED_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);
+          }
+        }, ALARMS_ENABLED_ATTRIBUTE_ID, true);
     }
 
-    public void getYearDaySchedule(GetYearDayScheduleResponseCallback callback, Integer yearDayIndex, Integer userIndex) {
-      getYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, null);
+    public void writeAlarmsEnabledAttribute(DefaultClusterCallback callback, Integer value) {
+      writeAlarmsEnabledAttribute(callback, value, 0);
     }
 
-    public void getYearDaySchedule(GetYearDayScheduleResponseCallback callback, Integer yearDayIndex, Integer userIndex, int timedInvokeTimeoutMs) {
-      getYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, timedInvokeTimeoutMs);
+    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 clearYearDaySchedule(DefaultClusterCallback callback, Integer yearDayIndex, Integer userIndex) {
-      clearYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, null);
-    }
+    public void subscribeAlarmsEnabledAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALARMS_ENABLED_ATTRIBUTE_ID);
 
-    public void clearYearDaySchedule(DefaultClusterCallback callback, Integer yearDayIndex, Integer userIndex, int timedInvokeTimeoutMs) {
-      clearYearDaySchedule(chipClusterPtr, callback, yearDayIndex, userIndex, timedInvokeTimeoutMs);
+      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 setHolidaySchedule(DefaultClusterCallback callback, Integer holidayIndex, Long localStartTime, Long localEndTime, Integer operatingMode) {
-      setHolidaySchedule(chipClusterPtr, callback, holidayIndex, localStartTime, localEndTime, operatingMode, null);
-    }
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void setHolidaySchedule(DefaultClusterCallback callback, Integer holidayIndex, Long localStartTime, Long localEndTime, Integer operatingMode, int timedInvokeTimeoutMs) {
-      setHolidaySchedule(chipClusterPtr, callback, holidayIndex, localStartTime, localEndTime, operatingMode, 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);
     }
 
-    public void getHolidaySchedule(GetHolidayScheduleResponseCallback callback, Integer holidayIndex) {
-      getHolidaySchedule(chipClusterPtr, callback, holidayIndex, null);
-    }
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void getHolidaySchedule(GetHolidayScheduleResponseCallback callback, Integer holidayIndex, int timedInvokeTimeoutMs) {
-      getHolidaySchedule(chipClusterPtr, callback, holidayIndex, timedInvokeTimeoutMs);
+      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 clearHolidaySchedule(DefaultClusterCallback callback, Integer holidayIndex) {
-      clearHolidaySchedule(chipClusterPtr, callback, holidayIndex, null);
-    }
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void clearHolidaySchedule(DefaultClusterCallback callback, Integer holidayIndex, int timedInvokeTimeoutMs) {
-      clearHolidaySchedule(chipClusterPtr, callback, holidayIndex, timedInvokeTimeoutMs);
+      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) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    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);
+      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 getUser(GetUserResponseCallback callback, Integer userIndex) {
-      getUser(chipClusterPtr, callback, userIndex, null);
-    }
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    public void getUser(GetUserResponseCallback callback, Integer userIndex, int timedInvokeTimeoutMs) {
-      getUser(chipClusterPtr, callback, userIndex, 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 clearUser(DefaultClusterCallback callback, Integer userIndex, int timedInvokeTimeoutMs) {
-      clearUser(chipClusterPtr, callback, userIndex, 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 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);
+      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 getCredentialStatus(GetCredentialStatusResponseCallback callback, ChipStructs.DoorLockClusterCredentialStruct credential) {
-      getCredentialStatus(chipClusterPtr, callback, credential, null);
-    }
+    public void subscribeAttributeListAttribute(
+        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    public void getCredentialStatus(GetCredentialStatusResponseCallback callback, ChipStructs.DoorLockClusterCredentialStruct credential, int timedInvokeTimeoutMs) {
-      getCredentialStatus(chipClusterPtr, callback, credential, 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 readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_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);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, true);
     }
 
+    public void subscribeFeatureMapAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_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);
+          }
+        }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    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);
+    public void readClusterRevisionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void unlockWithTimeout(long chipClusterPtr, DefaultClusterCallback callback, Integer timeout, 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);
+          }
+        }, CLUSTER_REVISION_ATTRIBUTE_ID, true);
+    }
 
-    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);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void getWeekDaySchedule(long chipClusterPtr, GetWeekDayScheduleResponseCallback callback, Integer weekDayIndex, Integer userIndex, @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 clearWeekDaySchedule(long chipClusterPtr, DefaultClusterCallback callback, Integer weekDayIndex, Integer userIndex, @Nullable Integer timedInvokeTimeoutMs);
+  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);
+    }
 
-    private native void setYearDaySchedule(long chipClusterPtr, DefaultClusterCallback callback, Integer yearDayIndex, Integer userIndex, Long localStartTime, Long localEndTime, @Nullable Integer timedInvokeTimeoutMs);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void getYearDaySchedule(long chipClusterPtr, GetYearDayScheduleResponseCallback callback, Integer yearDayIndex, Integer userIndex, @Nullable Integer timedInvokeTimeoutMs);
+    public void open(DefaultClusterCallback callback, Optional<Long> openDuration) {
+      open(callback, openDuration, 0);
+    }
 
-    private native void clearYearDaySchedule(long chipClusterPtr, DefaultClusterCallback callback, Integer yearDayIndex, Integer userIndex, @Nullable Integer timedInvokeTimeoutMs);
+    public void open(DefaultClusterCallback callback, Optional<Long> openDuration, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    private native void setHolidaySchedule(long chipClusterPtr, DefaultClusterCallback callback, Integer holidayIndex, Long localStartTime, Long localEndTime, Integer operatingMode, @Nullable Integer timedInvokeTimeoutMs);
+      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));
 
-    private native void getHolidaySchedule(long chipClusterPtr, GetHolidayScheduleResponseCallback callback, Integer holidayIndex, @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 clearHolidaySchedule(long chipClusterPtr, DefaultClusterCallback callback, Integer holidayIndex, @Nullable Integer timedInvokeTimeoutMs);
+    public void close(DefaultClusterCallback callback) {
+      close(callback, 0);
+    }
 
-    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 close(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
 
-    private native void getUser(long chipClusterPtr, GetUserResponseCallback callback, Integer userIndex, @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 clearUser(long chipClusterPtr, DefaultClusterCallback callback, Integer userIndex, @Nullable Integer timedInvokeTimeoutMs);
+    public void setLevel(DefaultClusterCallback callback, Integer level, Optional<Long> openDuration) {
+      setLevel(callback, level, openDuration, 0);
+    }
 
-    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);
+    public void setLevel(DefaultClusterCallback callback, Integer level, Optional<Long> openDuration, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
 
-    private native void getCredentialStatus(long chipClusterPtr, GetCredentialStatusResponseCallback callback, ChipStructs.DoorLockClusterCredentialStruct credential, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long levelFieldID = 0L;
+      BaseTLVType leveltlvValue = new UIntType(level);
+      elements.add(new StructElement(levelFieldID, leveltlvValue));
 
-    private native void clearCredential(long chipClusterPtr, DefaultClusterCallback callback, @Nullable ChipStructs.DoorLockClusterCredentialStruct credential, @Nullable Integer timedInvokeTimeoutMs);
+      final long openDurationFieldID = 1L;
+      BaseTLVType openDurationtlvValue = openDuration.<BaseTLVType>map((nonOptionalopenDuration) -> new UIntType(nonOptionalopenDuration)).orElse(new EmptyType());
+      elements.add(new StructElement(openDurationFieldID, openDurationtlvValue));
 
-    private native void unboltDoor(long chipClusterPtr, DefaultClusterCallback callback, Optional<byte[]> PINCode, @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 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 OpenDurationAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public interface GetYearDayScheduleResponseCallback {
-      void onSuccess(Integer yearDayIndex, Integer userIndex, Integer status, Optional<Long> localStartTime, Optional<Long> localEndTime);
-      void onError(Exception error);
+    public interface AutoCloseTimeAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public interface GetHolidayScheduleResponseCallback {
-      void onSuccess(Integer holidayIndex, Integer status, Optional<Long> localStartTime, Optional<Long> localEndTime, Optional<Integer> operatingMode);
-      void onError(Exception error);
+    public interface RemainingDurationAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    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 CurrentStateAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public interface SetCredentialResponseCallback {
-      void onSuccess(Integer status, @Nullable Integer userIndex, @Nullable Integer nextCredentialIndex);
-      void onError(Exception error);
+    public interface TargetStateAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    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 CurrentLevelAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public interface LockStateAttributeCallback {
+    public interface TargetLevelAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface DoorStateAttributeCallback {
+    public interface OpenLevelAttributeCallback 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 readLockStateAttribute(
-        LockStateAttributeCallback callback) {
-        readLockStateAttribute(chipClusterPtr, callback);
-    }
+    public void readOpenDurationAttribute(
+        OpenDurationAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPEN_DURATION_ATTRIBUTE_ID);
 
-    public void subscribeLockStateAttribute(
-        LockStateAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLockStateAttribute(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);
+          }
+        }, OPEN_DURATION_ATTRIBUTE_ID, true);
     }
 
-    public void readLockTypeAttribute(
-        IntegerAttributeCallback callback) {
-        readLockTypeAttribute(chipClusterPtr, callback);
+    public void writeOpenDurationAttribute(DefaultClusterCallback callback, Long value) {
+      writeOpenDurationAttribute(callback, value, 0);
     }
 
-    public void subscribeLockTypeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLockTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    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 readActuatorEnabledAttribute(
-        BooleanAttributeCallback callback) {
-        readActuatorEnabledAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeOpenDurationAttribute(
+        OpenDurationAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPEN_DURATION_ATTRIBUTE_ID);
 
-    public void subscribeActuatorEnabledAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeActuatorEnabledAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      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 readDoorStateAttribute(
-        DoorStateAttributeCallback callback) {
-        readDoorStateAttribute(chipClusterPtr, callback);
-    }
+    public void readAutoCloseTimeAttribute(
+        AutoCloseTimeAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AUTO_CLOSE_TIME_ATTRIBUTE_ID);
 
-    public void subscribeDoorStateAttribute(
-        DoorStateAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDoorStateAttribute(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);
+          }
+        }, AUTO_CLOSE_TIME_ATTRIBUTE_ID, true);
     }
 
-    public void readDoorOpenEventsAttribute(
-        LongAttributeCallback callback) {
-        readDoorOpenEventsAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeAutoCloseTimeAttribute(
+        AutoCloseTimeAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AUTO_CLOSE_TIME_ATTRIBUTE_ID);
 
-    public void writeDoorOpenEventsAttribute(DefaultClusterCallback callback, Long value) {
-        writeDoorOpenEventsAttribute(chipClusterPtr, callback, value, null);
+      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 writeDoorOpenEventsAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeDoorOpenEventsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    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 subscribeDoorOpenEventsAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDoorOpenEventsAttribute(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 readDoorClosedEventsAttribute(
-        LongAttributeCallback callback) {
-        readDoorClosedEventsAttribute(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 writeDoorClosedEventsAttribute(DefaultClusterCallback callback, Long value) {
-        writeDoorClosedEventsAttribute(chipClusterPtr, callback, value, null);
+    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 writeDoorClosedEventsAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeDoorClosedEventsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    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 subscribeDoorClosedEventsAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDoorClosedEventsAttribute(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 readOpenPeriodAttribute(
+    public void readStartUpStateAttribute(
         IntegerAttributeCallback callback) {
-        readOpenPeriodAttribute(chipClusterPtr, 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 writeOpenPeriodAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOpenPeriodAttribute(chipClusterPtr, callback, value, null);
+    public void writeStartUpStateAttribute(DefaultClusterCallback callback, Integer value) {
+      writeStartUpStateAttribute(callback, value, 0);
     }
 
-    public void writeOpenPeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOpenPeriodAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    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 subscribeOpenPeriodAttribute(
+    public void subscribeStartUpStateAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOpenPeriodAttribute(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);
     }
 
-    public void readNumberOfTotalUsersSupportedAttribute(
-        IntegerAttributeCallback callback) {
-        readNumberOfTotalUsersSupportedAttribute(chipClusterPtr, callback);
+    public void readCurrentLevelAttribute(
+        CurrentLevelAttributeCallback 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 subscribeNumberOfTotalUsersSupportedAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfTotalUsersSupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentLevelAttribute(
+        CurrentLevelAttributeCallback callback, int minInterval, int 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 readNumberOfPINUsersSupportedAttribute(
-        IntegerAttributeCallback callback) {
-        readNumberOfPINUsersSupportedAttribute(chipClusterPtr, callback);
+    public void readTargetLevelAttribute(
+        TargetLevelAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGET_LEVEL_ATTRIBUTE_ID);
+
+      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);
     }
 
-    public void subscribeNumberOfPINUsersSupportedAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfPINUsersSupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTargetLevelAttribute(
+        TargetLevelAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGET_LEVEL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, TARGET_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readNumberOfRFIDUsersSupportedAttribute(
-        IntegerAttributeCallback callback) {
-        readNumberOfRFIDUsersSupportedAttribute(chipClusterPtr, callback);
+    public void readOpenLevelAttribute(
+        OpenLevelAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPEN_LEVEL_ATTRIBUTE_ID);
+
+      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);
     }
 
-    public void subscribeNumberOfRFIDUsersSupportedAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfRFIDUsersSupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeOpenLevelAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOpenLevelAttribute(callback, value, 0);
     }
 
-    public void readNumberOfWeekDaySchedulesSupportedPerUserAttribute(
-        IntegerAttributeCallback callback) {
-        readNumberOfWeekDaySchedulesSupportedPerUserAttribute(chipClusterPtr, callback);
+    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);
     }
 
-    public void subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOpenLevelAttribute(
+        OpenLevelAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPEN_LEVEL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPEN_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readNumberOfYearDaySchedulesSupportedPerUserAttribute(
+    public void readValveFaultAttribute(
         IntegerAttributeCallback callback) {
-        readNumberOfYearDaySchedulesSupportedPerUserAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VALVE_FAULT_ATTRIBUTE_ID);
+
+      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);
     }
 
-    public void subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(
+    public void subscribeValveFaultAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, VALVE_FAULT_ATTRIBUTE_ID);
 
-    public void readNumberOfHolidaySchedulesSupportedAttribute(
-        IntegerAttributeCallback callback) {
-        readNumberOfHolidaySchedulesSupportedAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, VALVE_FAULT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeNumberOfHolidaySchedulesSupportedAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfHolidaySchedulesSupportedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void readMaxPINCodeLengthAttribute(
-        IntegerAttributeCallback callback) {
-        readMaxPINCodeLengthAttribute(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 subscribeMaxPINCodeLengthAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxPINCodeLengthAttribute(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 readMinPINCodeLengthAttribute(
-        IntegerAttributeCallback callback) {
-        readMinPINCodeLengthAttribute(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 subscribeMinPINCodeLengthAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinPINCodeLengthAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readAcceptedCommandListAttribute(
+        AcceptedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void readMaxRFIDCodeLengthAttribute(
-        IntegerAttributeCallback callback) {
-        readMaxRFIDCodeLengthAttribute(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 subscribeMaxRFIDCodeLengthAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxRFIDCodeLengthAttribute(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 readMinRFIDCodeLengthAttribute(
-        IntegerAttributeCallback callback) {
-        readMinRFIDCodeLengthAttribute(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 subscribeMinRFIDCodeLengthAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinRFIDCodeLengthAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readEventListAttribute(
+        EventListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID);
 
-    public void readCredentialRulesSupportAttribute(
-        IntegerAttributeCallback callback) {
-        readCredentialRulesSupportAttribute(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 subscribeCredentialRulesSupportAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCredentialRulesSupportAttribute(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 readNumberOfCredentialsSupportedPerUserAttribute(
-        IntegerAttributeCallback callback) {
-        readNumberOfCredentialsSupportedPerUserAttribute(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 subscribeNumberOfCredentialsSupportedPerUserAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfCredentialsSupportedPerUserAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readAttributeListAttribute(
+        AttributeListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID);
 
-    public void readLanguageAttribute(
-        CharStringAttributeCallback callback) {
-        readLanguageAttribute(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 writeLanguageAttribute(DefaultClusterCallback callback, String value) {
-        writeLanguageAttribute(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 writeLanguageAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-        writeLanguageAttribute(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 subscribeLanguageAttribute(
-        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLanguageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readFeatureMapAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID);
 
-    public void readLEDSettingsAttribute(
-        IntegerAttributeCallback callback) {
-        readLEDSettingsAttribute(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 writeLEDSettingsAttribute(DefaultClusterCallback callback, Integer value) {
-        writeLEDSettingsAttribute(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 writeLEDSettingsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeLEDSettingsAttribute(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 subscribeLEDSettingsAttribute(
+    public void subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLEDSettingsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    public void readAutoRelockTimeAttribute(
-        LongAttributeCallback callback) {
-        readAutoRelockTimeAttribute(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 writeAutoRelockTimeAttribute(DefaultClusterCallback callback, Long value) {
-        writeAutoRelockTimeAttribute(chipClusterPtr, callback, value, null);
+  public static class DemandResponseLoadControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 150L;
+
+    private static final long DEVICE_CLASS_ATTRIBUTE_ID = 0L;
+    private static final long LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID = 1L;
+    private static final long NUMBER_OF_LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID = 2L;
+    private static final long EVENTS_ATTRIBUTE_ID = 3L;
+    private static final long ACTIVE_EVENTS_ATTRIBUTE_ID = 4L;
+    private static final long NUMBER_OF_EVENTS_PER_PROGRAM_ATTRIBUTE_ID = 5L;
+    private static final long NUMBER_OF_TRANSISTIONS_ATTRIBUTE_ID = 6L;
+    private static final long DEFAULT_RANDOM_START_ATTRIBUTE_ID = 7L;
+    private static final long DEFAULT_RANDOM_DURATION_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 DemandResponseLoadControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    public void writeAutoRelockTimeAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeAutoRelockTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void subscribeAutoRelockTimeAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAutoRelockTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void registerLoadControlProgramRequest(DefaultClusterCallback callback, ChipStructs.DemandResponseLoadControlClusterLoadControlProgramStruct loadControlProgram) {
+      registerLoadControlProgramRequest(callback, loadControlProgram, 0);
     }
 
-    public void readSoundVolumeAttribute(
-        IntegerAttributeCallback callback) {
-        readSoundVolumeAttribute(chipClusterPtr, callback);
-    }
+    public void registerLoadControlProgramRequest(DefaultClusterCallback callback, ChipStructs.DemandResponseLoadControlClusterLoadControlProgramStruct loadControlProgram, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    public void writeSoundVolumeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeSoundVolumeAttribute(chipClusterPtr, callback, value, null);
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long loadControlProgramFieldID = 0L;
+      BaseTLVType loadControlProgramtlvValue = loadControlProgram.encodeTlv();
+      elements.add(new StructElement(loadControlProgramFieldID, loadControlProgramtlvValue));
 
-    public void writeSoundVolumeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeSoundVolumeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void subscribeSoundVolumeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSoundVolumeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void unregisterLoadControlProgramRequest(DefaultClusterCallback callback, byte[] loadControlProgramID) {
+      unregisterLoadControlProgramRequest(callback, loadControlProgramID, 0);
     }
 
-    public void readOperatingModeAttribute(
-        IntegerAttributeCallback callback) {
-        readOperatingModeAttribute(chipClusterPtr, callback);
-    }
+    public void unregisterLoadControlProgramRequest(DefaultClusterCallback callback, byte[] loadControlProgramID, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
 
-    public void writeOperatingModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOperatingModeAttribute(chipClusterPtr, callback, value, null);
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long loadControlProgramIDFieldID = 0L;
+      BaseTLVType loadControlProgramIDtlvValue = new ByteArrayType(loadControlProgramID);
+      elements.add(new StructElement(loadControlProgramIDFieldID, loadControlProgramIDtlvValue));
 
-    public void writeOperatingModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOperatingModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void subscribeOperatingModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOperatingModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void addLoadControlEventRequest(DefaultClusterCallback callback, ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct event) {
+      addLoadControlEventRequest(callback, event, 0);
     }
 
-    public void readSupportedOperatingModesAttribute(
-        IntegerAttributeCallback callback) {
-        readSupportedOperatingModesAttribute(chipClusterPtr, callback);
-    }
+    public void addLoadControlEventRequest(DefaultClusterCallback callback, ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct event, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
 
-    public void subscribeSupportedOperatingModesAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedOperatingModesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long eventFieldID = 0L;
+      BaseTLVType eventtlvValue = event.encodeTlv();
+      elements.add(new StructElement(eventFieldID, eventtlvValue));
 
-    public void readDefaultConfigurationRegisterAttribute(
-        IntegerAttributeCallback callback) {
-        readDefaultConfigurationRegisterAttribute(chipClusterPtr, callback);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void subscribeDefaultConfigurationRegisterAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDefaultConfigurationRegisterAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void removeLoadControlEventRequest(DefaultClusterCallback callback, byte[] eventID, Integer cancelControl) {
+      removeLoadControlEventRequest(callback, eventID, cancelControl, 0);
     }
 
-    public void readEnableLocalProgrammingAttribute(
-        BooleanAttributeCallback callback) {
-        readEnableLocalProgrammingAttribute(chipClusterPtr, callback);
-    }
+    public void removeLoadControlEventRequest(DefaultClusterCallback callback, byte[] eventID, Integer cancelControl, int timedInvokeTimeoutMs) {
+      final long commandId = 3L;
 
-    public void writeEnableLocalProgrammingAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeEnableLocalProgrammingAttribute(chipClusterPtr, callback, value, null);
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long eventIDFieldID = 0L;
+      BaseTLVType eventIDtlvValue = new ByteArrayType(eventID);
+      elements.add(new StructElement(eventIDFieldID, eventIDtlvValue));
 
-    public void writeEnableLocalProgrammingAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeEnableLocalProgrammingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+      final long cancelControlFieldID = 1L;
+      BaseTLVType cancelControltlvValue = new UIntType(cancelControl);
+      elements.add(new StructElement(cancelControlFieldID, cancelControltlvValue));
 
-    public void subscribeEnableLocalProgrammingAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEnableLocalProgrammingAttribute(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 readEnableOneTouchLockingAttribute(
-        BooleanAttributeCallback callback) {
-        readEnableOneTouchLockingAttribute(chipClusterPtr, callback);
+    public void clearLoadControlEventsRequest(DefaultClusterCallback callback) {
+      clearLoadControlEventsRequest(callback, 0);
     }
 
-    public void writeEnableOneTouchLockingAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeEnableOneTouchLockingAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void clearLoadControlEventsRequest(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 4L;
 
-    public void writeEnableOneTouchLockingAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeEnableOneTouchLockingAttribute(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 subscribeEnableOneTouchLockingAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEnableOneTouchLockingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface LoadControlProgramsAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.DemandResponseLoadControlClusterLoadControlProgramStruct> value);
     }
 
-    public void readEnableInsideStatusLEDAttribute(
-        BooleanAttributeCallback callback) {
-        readEnableInsideStatusLEDAttribute(chipClusterPtr, callback);
+    public interface EventsAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct> value);
     }
 
-    public void writeEnableInsideStatusLEDAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeEnableInsideStatusLEDAttribute(chipClusterPtr, callback, value, null);
+    public interface ActiveEventsAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct> value);
     }
 
-    public void writeEnableInsideStatusLEDAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeEnableInsideStatusLEDAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeEnableInsideStatusLEDAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEnableInsideStatusLEDAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readEnablePrivacyModeButtonAttribute(
-        BooleanAttributeCallback callback) {
-        readEnablePrivacyModeButtonAttribute(chipClusterPtr, callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void writeEnablePrivacyModeButtonAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeEnablePrivacyModeButtonAttribute(chipClusterPtr, callback, value, null);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void writeEnablePrivacyModeButtonAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeEnablePrivacyModeButtonAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
-    }
+    public void readDeviceClassAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEVICE_CLASS_ATTRIBUTE_ID);
 
-    public void subscribeEnablePrivacyModeButtonAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEnablePrivacyModeButtonAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DEVICE_CLASS_ATTRIBUTE_ID, true);
     }
 
-    public void readLocalProgrammingFeaturesAttribute(
-        IntegerAttributeCallback callback) {
-        readLocalProgrammingFeaturesAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeDeviceClassAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEVICE_CLASS_ATTRIBUTE_ID);
 
-    public void writeLocalProgrammingFeaturesAttribute(DefaultClusterCallback callback, Integer value) {
-        writeLocalProgrammingFeaturesAttribute(chipClusterPtr, callback, value, null);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DEVICE_CLASS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeLocalProgrammingFeaturesAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeLocalProgrammingFeaturesAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readLoadControlProgramsAttribute(
+        LoadControlProgramsAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID);
+
+      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 subscribeLocalProgrammingFeaturesAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLocalProgrammingFeaturesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeLoadControlProgramsAttribute(
+        LoadControlProgramsAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOAD_CONTROL_PROGRAMS_ATTRIBUTE_ID);
+
+      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 readWrongCodeEntryLimitAttribute(
+    public void readNumberOfLoadControlProgramsAttribute(
         IntegerAttributeCallback callback) {
-        readWrongCodeEntryLimitAttribute(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 writeWrongCodeEntryLimitAttribute(DefaultClusterCallback callback, Integer value) {
-        writeWrongCodeEntryLimitAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeNumberOfLoadControlProgramsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int 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 writeWrongCodeEntryLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeWrongCodeEntryLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readEventsAttribute(
+        EventsAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENTS_ATTRIBUTE_ID);
+
+      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 subscribeWrongCodeEntryLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWrongCodeEntryLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeEventsAttribute(
+        EventsAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENTS_ATTRIBUTE_ID);
+
+      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 readUserCodeTemporaryDisableTimeAttribute(
-        IntegerAttributeCallback callback) {
-        readUserCodeTemporaryDisableTimeAttribute(chipClusterPtr, callback);
+    public void readActiveEventsAttribute(
+        ActiveEventsAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_EVENTS_ATTRIBUTE_ID);
+
+      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 writeUserCodeTemporaryDisableTimeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeUserCodeTemporaryDisableTimeAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeActiveEventsAttribute(
+        ActiveEventsAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTIVE_EVENTS_ATTRIBUTE_ID);
+
+      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 writeUserCodeTemporaryDisableTimeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeUserCodeTemporaryDisableTimeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readNumberOfEventsPerProgramAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_EVENTS_PER_PROGRAM_ATTRIBUTE_ID);
+
+      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 subscribeUserCodeTemporaryDisableTimeAttribute(
+    public void subscribeNumberOfEventsPerProgramAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUserCodeTemporaryDisableTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_EVENTS_PER_PROGRAM_ATTRIBUTE_ID);
 
-    public void readSendPINOverTheAirAttribute(
-        BooleanAttributeCallback callback) {
-        readSendPINOverTheAirAttribute(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 writeSendPINOverTheAirAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeSendPINOverTheAirAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readNumberOfTransistionsAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_TRANSISTIONS_ATTRIBUTE_ID);
 
-    public void writeSendPINOverTheAirAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeSendPINOverTheAirAttribute(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_TRANSISTIONS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeSendPINOverTheAirAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSendPINOverTheAirAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeNumberOfTransistionsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_TRANSISTIONS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, NUMBER_OF_TRANSISTIONS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readRequirePINforRemoteOperationAttribute(
-        BooleanAttributeCallback callback) {
-        readRequirePINforRemoteOperationAttribute(chipClusterPtr, callback);
+    public void readDefaultRandomStartAttribute(
+        IntegerAttributeCallback 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 writeRequirePINforRemoteOperationAttribute(DefaultClusterCallback callback, Boolean value) {
-        writeRequirePINforRemoteOperationAttribute(chipClusterPtr, callback, value, null);
+    public void writeDefaultRandomStartAttribute(DefaultClusterCallback callback, Integer value) {
+      writeDefaultRandomStartAttribute(callback, value, 0);
     }
 
-    public void writeRequirePINforRemoteOperationAttribute(DefaultClusterCallback callback, Boolean value, int timedWriteTimeoutMs) {
-        writeRequirePINforRemoteOperationAttribute(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 subscribeRequirePINforRemoteOperationAttribute(
-        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRequirePINforRemoteOperationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeDefaultRandomStartAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_RANDOM_START_ATTRIBUTE_ID);
+
+      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 readExpiringUserTimeoutAttribute(
+    public void readDefaultRandomDurationAttribute(
         IntegerAttributeCallback callback) {
-        readExpiringUserTimeoutAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_RANDOM_DURATION_ATTRIBUTE_ID);
+
+      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 writeExpiringUserTimeoutAttribute(DefaultClusterCallback callback, Integer value) {
-        writeExpiringUserTimeoutAttribute(chipClusterPtr, callback, value, null);
+    public void writeDefaultRandomDurationAttribute(DefaultClusterCallback callback, Integer value) {
+      writeDefaultRandomDurationAttribute(callback, value, 0);
     }
 
-    public void writeExpiringUserTimeoutAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeExpiringUserTimeoutAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    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 subscribeExpiringUserTimeoutAttribute(
+    public void subscribeDefaultRandomDurationAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeExpiringUserTimeoutAttribute(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);
+      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 readLockStateAttribute(long chipClusterPtr, LockStateAttributeCallback callback);
+  public static class DoorLockCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 257L;
 
-    private native void subscribeLockStateAttribute(long chipClusterPtr, LockStateAttributeCallback callback, int minInterval, int maxInterval);
+    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;
 
-    private native void readLockTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public DoorLockCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void subscribeLockTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void readActuatorEnabledAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
 
-    private native void subscribeActuatorEnabledAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    public void lockDoor(DefaultClusterCallback callback, Optional<byte[]> PINCode, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    private native void readDoorStateAttribute(long chipClusterPtr, DoorStateAttributeCallback callback);
+      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 subscribeDoorStateAttribute(long chipClusterPtr, DoorStateAttributeCallback 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 readDoorOpenEventsAttribute(long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void writeDoorOpenEventsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void unlockDoor(DefaultClusterCallback callback, Optional<byte[]> PINCode, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
 
-    private native void subscribeDoorOpenEventsAttribute(long chipClusterPtr, LongAttributeCallback 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 readDoorClosedEventsAttribute(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 writeDoorClosedEventsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeDoorClosedEventsAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void unlockWithTimeout(DefaultClusterCallback callback, Integer timeout, Optional<byte[]> PINCode, int timedInvokeTimeoutMs) {
+      final long commandId = 3L;
 
-    private native void readOpenPeriodAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long timeoutFieldID = 0L;
+      BaseTLVType timeouttlvValue = new UIntType(timeout);
+      elements.add(new StructElement(timeoutFieldID, timeouttlvValue));
 
-    private native void writeOpenPeriodAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      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 subscribeOpenPeriodAttribute(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 readNumberOfTotalUsersSupportedAttribute(long chipClusterPtr, IntegerAttributeCallback 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 subscribeNumberOfTotalUsersSupportedAttribute(long chipClusterPtr, IntegerAttributeCallback 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 readNumberOfPINUsersSupportedAttribute(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 subscribeNumberOfPINUsersSupportedAttribute(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 readNumberOfRFIDUsersSupportedAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      final long daysMaskFieldID = 2L;
+      BaseTLVType daysMasktlvValue = new UIntType(daysMask);
+      elements.add(new StructElement(daysMaskFieldID, daysMasktlvValue));
 
-    private native void subscribeNumberOfRFIDUsersSupportedAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      final long startHourFieldID = 3L;
+      BaseTLVType startHourtlvValue = new UIntType(startHour);
+      elements.add(new StructElement(startHourFieldID, startHourtlvValue));
 
-    private native void readNumberOfWeekDaySchedulesSupportedPerUserAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      final long startMinuteFieldID = 4L;
+      BaseTLVType startMinutetlvValue = new UIntType(startMinute);
+      elements.add(new StructElement(startMinuteFieldID, startMinutetlvValue));
 
-    private native void subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      final long endHourFieldID = 5L;
+      BaseTLVType endHourtlvValue = new UIntType(endHour);
+      elements.add(new StructElement(endHourFieldID, endHourtlvValue));
 
-    private native void readNumberOfYearDaySchedulesSupportedPerUserAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      final long endMinuteFieldID = 6L;
+      BaseTLVType endMinutetlvValue = new UIntType(endMinute);
+      elements.add(new StructElement(endMinuteFieldID, endMinutetlvValue));
 
-    private native void subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(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 readNumberOfHolidaySchedulesSupportedAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void getWeekDaySchedule(GetWeekDayScheduleResponseCallback callback, Integer weekDayIndex, Integer userIndex) {
+      getWeekDaySchedule(callback, weekDayIndex, userIndex, 0);
+    }
 
-    private native void subscribeNumberOfHolidaySchedulesSupportedAttribute(long chipClusterPtr, IntegerAttributeCallback 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 readMaxPINCodeLengthAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void clearWeekDaySchedule(DefaultClusterCallback callback, Integer weekDayIndex, Integer userIndex) {
+      clearWeekDaySchedule(callback, weekDayIndex, userIndex, 0);
+    }
 
-    private native void subscribeMaxPINCodeLengthAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void clearWeekDaySchedule(DefaultClusterCallback callback, Integer weekDayIndex, Integer userIndex, int timedInvokeTimeoutMs) {
+      final long commandId = 13L;
 
-    private native void readMinPINCodeLengthAttribute(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 subscribeMinPINCodeLengthAttribute(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 readMaxRFIDCodeLengthAttribute(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 subscribeMaxRFIDCodeLengthAttribute(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 readMinRFIDCodeLengthAttribute(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 subscribeMinRFIDCodeLengthAttribute(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 readCredentialRulesSupportAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      final long userIndexFieldID = 1L;
+      BaseTLVType userIndextlvValue = new UIntType(userIndex);
+      elements.add(new StructElement(userIndexFieldID, userIndextlvValue));
 
-    private native void subscribeCredentialRulesSupportAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      final long localStartTimeFieldID = 2L;
+      BaseTLVType localStartTimetlvValue = new UIntType(localStartTime);
+      elements.add(new StructElement(localStartTimeFieldID, localStartTimetlvValue));
 
-    private native void readNumberOfCredentialsSupportedPerUserAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      final long localEndTimeFieldID = 3L;
+      BaseTLVType localEndTimetlvValue = new UIntType(localEndTime);
+      elements.add(new StructElement(localEndTimeFieldID, localEndTimetlvValue));
 
-    private native void subscribeNumberOfCredentialsSupportedPerUserAttribute(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 readLanguageAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+    public void getYearDaySchedule(GetYearDayScheduleResponseCallback callback, Integer yearDayIndex, Integer userIndex) {
+      getYearDaySchedule(callback, yearDayIndex, userIndex, 0);
+    }
 
-    private native void writeLanguageAttribute(long chipClusterPtr, DefaultClusterCallback callback, String 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 subscribeLanguageAttribute(long chipClusterPtr, CharStringAttributeCallback callback, int minInterval, int maxInterval);
+    public void clearYearDaySchedule(DefaultClusterCallback callback, Integer yearDayIndex, Integer userIndex) {
+      clearYearDaySchedule(callback, yearDayIndex, userIndex, 0);
+    }
 
-    private native void readLEDSettingsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void clearYearDaySchedule(DefaultClusterCallback callback, Integer yearDayIndex, Integer userIndex, int timedInvokeTimeoutMs) {
+      final long commandId = 16L;
 
-    private native void writeLEDSettingsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long yearDayIndexFieldID = 0L;
+      BaseTLVType yearDayIndextlvValue = new UIntType(yearDayIndex);
+      elements.add(new StructElement(yearDayIndexFieldID, yearDayIndextlvValue));
 
-    private native void subscribeLEDSettingsAttribute(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 readAutoRelockTimeAttribute(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 writeAutoRelockTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void setHolidaySchedule(DefaultClusterCallback callback, Integer holidayIndex, Long localStartTime, Long localEndTime, Integer operatingMode) {
+      setHolidaySchedule(callback, holidayIndex, localStartTime, localEndTime, operatingMode, 0);
+    }
 
-    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);
+    public void setHolidaySchedule(DefaultClusterCallback callback, Integer holidayIndex, Long localStartTime, Long localEndTime, Integer operatingMode, int timedInvokeTimeoutMs) {
+      final long commandId = 17L;
 
-    private native void subscribeEnableOneTouchLockingAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long holidayIndexFieldID = 0L;
+      BaseTLVType holidayIndextlvValue = new UIntType(holidayIndex);
+      elements.add(new StructElement(holidayIndexFieldID, holidayIndextlvValue));
 
-    private native void readEnableInsideStatusLEDAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+      final long localStartTimeFieldID = 1L;
+      BaseTLVType localStartTimetlvValue = new UIntType(localStartTime);
+      elements.add(new StructElement(localStartTimeFieldID, localStartTimetlvValue));
 
-    private native void writeEnableInsideStatusLEDAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+      final long localEndTimeFieldID = 2L;
+      BaseTLVType localEndTimetlvValue = new UIntType(localEndTime);
+      elements.add(new StructElement(localEndTimeFieldID, localEndTimetlvValue));
 
-    private native void subscribeEnableInsideStatusLEDAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+      final long operatingModeFieldID = 3L;
+      BaseTLVType operatingModetlvValue = new UIntType(operatingMode);
+      elements.add(new StructElement(operatingModeFieldID, operatingModetlvValue));
 
-    private native void readEnablePrivacyModeButtonAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    private native void writeEnablePrivacyModeButtonAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+    public void getHolidaySchedule(GetHolidayScheduleResponseCallback callback, Integer holidayIndex) {
+      getHolidaySchedule(callback, holidayIndex, 0);
+    }
 
-    private native void subscribeEnablePrivacyModeButtonAttribute(long chipClusterPtr, BooleanAttributeCallback 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 readLocalProgrammingFeaturesAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void clearHolidaySchedule(DefaultClusterCallback callback, Integer holidayIndex) {
+      clearHolidaySchedule(callback, holidayIndex, 0);
+    }
 
-    private native void writeLocalProgrammingFeaturesAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void clearHolidaySchedule(DefaultClusterCallback callback, Integer holidayIndex, int timedInvokeTimeoutMs) {
+      final long commandId = 19L;
 
-    private native void subscribeLocalProgrammingFeaturesAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long holidayIndexFieldID = 0L;
+      BaseTLVType holidayIndextlvValue = new UIntType(holidayIndex);
+      elements.add(new StructElement(holidayIndexFieldID, holidayIndextlvValue));
 
-    private native void readWrongCodeEntryLimitAttribute(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 writeWrongCodeEntryLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
 
-    private native void subscribeWrongCodeEntryLimitAttribute(long chipClusterPtr, IntegerAttributeCallback 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 readUserCodeTemporaryDisableTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long operationTypeFieldID = 0L;
+      BaseTLVType operationTypetlvValue = new UIntType(operationType);
+      elements.add(new StructElement(operationTypeFieldID, operationTypetlvValue));
 
-    private native void writeUserCodeTemporaryDisableTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      final long userIndexFieldID = 1L;
+      BaseTLVType userIndextlvValue = new UIntType(userIndex);
+      elements.add(new StructElement(userIndexFieldID, userIndextlvValue));
 
-    private native void subscribeUserCodeTemporaryDisableTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+      final long userNameFieldID = 2L;
+      BaseTLVType userNametlvValue = userName != null ? new StringType(userName) : new NullType();
+      elements.add(new StructElement(userNameFieldID, userNametlvValue));
 
-    private native void readSendPINOverTheAirAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+      final long userUniqueIDFieldID = 3L;
+      BaseTLVType userUniqueIDtlvValue = userUniqueID != null ? new UIntType(userUniqueID) : new NullType();
+      elements.add(new StructElement(userUniqueIDFieldID, userUniqueIDtlvValue));
 
-    private native void writeSendPINOverTheAirAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean value, @Nullable Integer timedWriteTimeoutMs);
+      final long userStatusFieldID = 4L;
+      BaseTLVType userStatustlvValue = userStatus != null ? new UIntType(userStatus) : new NullType();
+      elements.add(new StructElement(userStatusFieldID, userStatustlvValue));
 
-    private native void subscribeSendPINOverTheAirAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+      final long userTypeFieldID = 5L;
+      BaseTLVType userTypetlvValue = userType != null ? new UIntType(userType) : new NullType();
+      elements.add(new StructElement(userTypeFieldID, userTypetlvValue));
 
-    private native void readRequirePINforRemoteOperationAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+      final long credentialRuleFieldID = 6L;
+      BaseTLVType credentialRuletlvValue = credentialRule != null ? new UIntType(credentialRule) : new NullType();
+      elements.add(new StructElement(credentialRuleFieldID, credentialRuletlvValue));
 
-    private native void writeRequirePINforRemoteOperationAttribute(long chipClusterPtr, DefaultClusterCallback callback, Boolean 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 subscribeRequirePINforRemoteOperationAttribute(long chipClusterPtr, BooleanAttributeCallback callback, int minInterval, int maxInterval);
+    public void getUser(GetUserResponseCallback callback, Integer userIndex) {
+      getUser(callback, userIndex, 0);
+    }
 
-    private native void readExpiringUserTimeoutAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    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);
+    }
 
-    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);
+    public void clearUser(DefaultClusterCallback callback, Integer userIndex, int timedInvokeTimeoutMs) {
+      final long commandId = 29L;
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long userIndexFieldID = 0L;
+      BaseTLVType userIndextlvValue = new UIntType(userIndex);
+      elements.add(new StructElement(userIndexFieldID, userIndextlvValue));
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback 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 readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    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);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void getCredentialStatus(GetCredentialStatusResponseCallback callback, ChipStructs.DoorLockClusterCredentialStruct credential) {
+      getCredentialStatus(callback, credential, 0);
+    }
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+    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 readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+    public void clearCredential(DefaultClusterCallback callback, @Nullable ChipStructs.DoorLockClusterCredentialStruct credential, int timedInvokeTimeoutMs) {
+      final long commandId = 38L;
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long credentialFieldID = 0L;
+      BaseTLVType credentialtlvValue = credential != null ? credential.encodeTlv() : new NullType();
+      elements.add(new StructElement(credentialFieldID, credentialtlvValue));
 
-    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);
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void unboltDoor(DefaultClusterCallback callback, Optional<byte[]> PINCode, int timedInvokeTimeoutMs) {
+      final long commandId = 39L;
 
-  public static class WindowCoveringCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 258L;
+      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));
 
-    public WindowCoveringCluster(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 void upOrOpen(DefaultClusterCallback callback) {
-      upOrOpen(chipClusterPtr, callback, null);
+    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 void upOrOpen(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      upOrOpen(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public interface GetYearDayScheduleResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer yearDayIndex, Integer userIndex, Integer status, Optional<Long> localStartTime, Optional<Long> localEndTime);
     }
 
-    public void downOrClose(DefaultClusterCallback callback) {
-      downOrClose(chipClusterPtr, callback, null);
+    public interface GetHolidayScheduleResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer holidayIndex, Integer status, Optional<Long> localStartTime, Optional<Long> localEndTime, Optional<Integer> operatingMode);
     }
 
-    public void downOrClose(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      downOrClose(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    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 void stopMotion(DefaultClusterCallback callback) {
-      stopMotion(chipClusterPtr, callback, null);
+    public interface SetCredentialResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer status, @Nullable Integer userIndex, @Nullable Integer nextCredentialIndex);
     }
 
-    public void stopMotion(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      stopMotion(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public interface GetCredentialStatusResponseCallback extends BaseClusterCallback {
+      void onSuccess(Boolean credentialExists, @Nullable Integer userIndex, @Nullable Integer creatorFabricIndex, @Nullable Integer lastModifiedFabricIndex, @Nullable Integer nextCredentialIndex);
     }
 
-    public void goToLiftValue(DefaultClusterCallback callback, Integer liftValue) {
-      goToLiftValue(chipClusterPtr, callback, liftValue, null);
+    public interface LockStateAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void goToLiftValue(DefaultClusterCallback callback, Integer liftValue, int timedInvokeTimeoutMs) {
-      goToLiftValue(chipClusterPtr, callback, liftValue, timedInvokeTimeoutMs);
+    public interface DoorStateAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void goToLiftPercentage(DefaultClusterCallback callback, Integer liftPercent100thsValue) {
-      goToLiftPercentage(chipClusterPtr, callback, liftPercent100thsValue, null);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void goToLiftPercentage(DefaultClusterCallback callback, Integer liftPercent100thsValue, int timedInvokeTimeoutMs) {
-      goToLiftPercentage(chipClusterPtr, callback, liftPercent100thsValue, timedInvokeTimeoutMs);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void goToTiltValue(DefaultClusterCallback callback, Integer tiltValue) {
-      goToTiltValue(chipClusterPtr, callback, tiltValue, null);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void goToTiltValue(DefaultClusterCallback callback, Integer tiltValue, int timedInvokeTimeoutMs) {
-      goToTiltValue(chipClusterPtr, callback, tiltValue, timedInvokeTimeoutMs);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void goToTiltPercentage(DefaultClusterCallback callback, Integer tiltPercent100thsValue) {
-      goToTiltPercentage(chipClusterPtr, callback, tiltPercent100thsValue, null);
-    }
+    public void readLockStateAttribute(
+        LockStateAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCK_STATE_ATTRIBUTE_ID);
 
-    public void goToTiltPercentage(DefaultClusterCallback callback, Integer tiltPercent100thsValue, int timedInvokeTimeoutMs) {
-      goToTiltPercentage(chipClusterPtr, callback, tiltPercent100thsValue, timedInvokeTimeoutMs);
+      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);
     }
 
-    private native void upOrOpen(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeLockStateAttribute(
+        LockStateAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCK_STATE_ATTRIBUTE_ID);
 
-    private native void downOrClose(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LOCK_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void stopMotion(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+    public void readLockTypeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCK_TYPE_ATTRIBUTE_ID);
 
-    private native void goToLiftValue(long chipClusterPtr, DefaultClusterCallback callback, Integer liftValue, @Nullable Integer timedInvokeTimeoutMs);
+      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);
+    }
 
-    private native void goToLiftPercentage(long chipClusterPtr, DefaultClusterCallback callback, Integer liftPercent100thsValue, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeLockTypeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCK_TYPE_ATTRIBUTE_ID);
 
-    private native void goToTiltValue(long chipClusterPtr, DefaultClusterCallback callback, Integer tiltValue, @Nullable Integer timedInvokeTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LOCK_TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void goToTiltPercentage(long chipClusterPtr, DefaultClusterCallback callback, Integer tiltPercent100thsValue, @Nullable Integer timedInvokeTimeoutMs);
+    public void readActuatorEnabledAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTUATOR_ENABLED_ATTRIBUTE_ID);
 
-    public interface CurrentPositionLiftAttributeCallback {
-      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) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ACTUATOR_ENABLED_ATTRIBUTE_ID, true);
     }
 
-    public interface CurrentPositionTiltAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeActuatorEnabledAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACTUATOR_ENABLED_ATTRIBUTE_ID);
 
-    public interface CurrentPositionLiftPercentageAttributeCallback {
-      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) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ACTUATOR_ENABLED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface CurrentPositionTiltPercentageAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readDoorStateAttribute(
+        DoorStateAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DOOR_STATE_ATTRIBUTE_ID);
 
-    public interface TargetPositionLiftPercent100thsAttributeCallback {
-      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) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DOOR_STATE_ATTRIBUTE_ID, true);
     }
 
-    public interface TargetPositionTiltPercent100thsAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeDoorStateAttribute(
+        DoorStateAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DOOR_STATE_ATTRIBUTE_ID);
 
-    public interface CurrentPositionLiftPercent100thsAttributeCallback {
-      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);
+          }
+        }, DOOR_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface CurrentPositionTiltPercent100thsAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readDoorOpenEventsAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DOOR_OPEN_EVENTS_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) {
+            Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, DOOR_OPEN_EVENTS_ATTRIBUTE_ID, true);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void writeDoorOpenEventsAttribute(DefaultClusterCallback callback, Long value) {
+      writeDoorOpenEventsAttribute(callback, value, 0);
     }
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    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 interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    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 readTypeAttribute(
-        IntegerAttributeCallback callback) {
-        readTypeAttribute(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 subscribeTypeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeDoorClosedEventsAttribute(DefaultClusterCallback callback, Long value) {
+      writeDoorClosedEventsAttribute(callback, value, 0);
     }
 
-    public void readPhysicalClosedLimitLiftAttribute(
-        IntegerAttributeCallback callback) {
-        readPhysicalClosedLimitLiftAttribute(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 subscribePhysicalClosedLimitLiftAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePhysicalClosedLimitLiftAttribute(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 readPhysicalClosedLimitTiltAttribute(
+    public void readOpenPeriodAttribute(
         IntegerAttributeCallback callback) {
-        readPhysicalClosedLimitTiltAttribute(chipClusterPtr, callback);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPEN_PERIOD_ATTRIBUTE_ID);
 
-    public void subscribePhysicalClosedLimitTiltAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePhysicalClosedLimitTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      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 readCurrentPositionLiftAttribute(
-        CurrentPositionLiftAttributeCallback callback) {
-        readCurrentPositionLiftAttribute(chipClusterPtr, callback);
+    public void writeOpenPeriodAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOpenPeriodAttribute(callback, value, 0);
     }
 
-    public void subscribeCurrentPositionLiftAttribute(
-        CurrentPositionLiftAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentPositionLiftAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    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 readCurrentPositionTiltAttribute(
-        CurrentPositionTiltAttributeCallback callback) {
-        readCurrentPositionTiltAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeOpenPeriodAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPEN_PERIOD_ATTRIBUTE_ID);
 
-    public void subscribeCurrentPositionTiltAttribute(
-        CurrentPositionTiltAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentPositionTiltAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      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 readNumberOfActuationsLiftAttribute(
+    public void readNumberOfTotalUsersSupportedAttribute(
         IntegerAttributeCallback callback) {
-        readNumberOfActuationsLiftAttribute(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 subscribeNumberOfActuationsLiftAttribute(
+    public void subscribeNumberOfTotalUsersSupportedAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfActuationsLiftAttribute(chipClusterPtr, callback, minInterval, 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 readNumberOfActuationsTiltAttribute(
+    public void readNumberOfPINUsersSupportedAttribute(
         IntegerAttributeCallback callback) {
-        readNumberOfActuationsTiltAttribute(chipClusterPtr, 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 subscribeNumberOfActuationsTiltAttribute(
+    public void subscribeNumberOfPINUsersSupportedAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfActuationsTiltAttribute(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 readConfigStatusAttribute(
+    public void readNumberOfRFIDUsersSupportedAttribute(
         IntegerAttributeCallback callback) {
-        readConfigStatusAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_R_F_I_D_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_R_F_I_D_USERS_SUPPORTED_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeConfigStatusAttribute(
+    public void subscribeNumberOfRFIDUsersSupportedAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeConfigStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_R_F_I_D_USERS_SUPPORTED_ATTRIBUTE_ID);
 
-    public void readCurrentPositionLiftPercentageAttribute(
-        CurrentPositionLiftPercentageAttributeCallback callback) {
-        readCurrentPositionLiftPercentageAttribute(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 subscribeCurrentPositionLiftPercentageAttribute(
-        CurrentPositionLiftPercentageAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentPositionLiftPercentageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readNumberOfWeekDaySchedulesSupportedPerUserAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_WEEK_DAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID);
 
-    public void readCurrentPositionTiltPercentageAttribute(
-        CurrentPositionTiltPercentageAttributeCallback callback) {
-        readCurrentPositionTiltPercentageAttribute(chipClusterPtr, callback);
+      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 subscribeCurrentPositionTiltPercentageAttribute(
-        CurrentPositionTiltPercentageAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentPositionTiltPercentageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeNumberOfWeekDaySchedulesSupportedPerUserAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_WEEK_DAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID);
+
+      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 readOperationalStatusAttribute(
+    public void readNumberOfYearDaySchedulesSupportedPerUserAttribute(
         IntegerAttributeCallback callback) {
-        readOperationalStatusAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_YEAR_DAY_SCHEDULES_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_YEAR_DAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeOperationalStatusAttribute(
+    public void subscribeNumberOfYearDaySchedulesSupportedPerUserAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOperationalStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_YEAR_DAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID);
 
-    public void readTargetPositionLiftPercent100thsAttribute(
-        TargetPositionLiftPercent100thsAttributeCallback callback) {
-        readTargetPositionLiftPercent100thsAttribute(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 subscribeTargetPositionLiftPercent100thsAttribute(
-        TargetPositionLiftPercent100thsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTargetPositionLiftPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readNumberOfHolidaySchedulesSupportedAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_HOLIDAY_SCHEDULES_SUPPORTED_ATTRIBUTE_ID);
 
-    public void readTargetPositionTiltPercent100thsAttribute(
-        TargetPositionTiltPercent100thsAttributeCallback callback) {
-        readTargetPositionTiltPercent100thsAttribute(chipClusterPtr, callback);
+      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 subscribeTargetPositionTiltPercent100thsAttribute(
-        TargetPositionTiltPercent100thsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTargetPositionTiltPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeNumberOfHolidaySchedulesSupportedAttribute(
+        IntegerAttributeCallback callback, int minInterval, int 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 readEndProductTypeAttribute(
+    public void readMaxPINCodeLengthAttribute(
         IntegerAttributeCallback callback) {
-        readEndProductTypeAttribute(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 subscribeEndProductTypeAttribute(
+    public void subscribeMaxPINCodeLengthAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEndProductTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_P_I_N_CODE_LENGTH_ATTRIBUTE_ID);
 
-    public void readCurrentPositionLiftPercent100thsAttribute(
-        CurrentPositionLiftPercent100thsAttributeCallback callback) {
-        readCurrentPositionLiftPercent100thsAttribute(chipClusterPtr, callback);
+      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 subscribeCurrentPositionLiftPercent100thsAttribute(
-        CurrentPositionLiftPercent100thsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentPositionLiftPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readMinPINCodeLengthAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_P_I_N_CODE_LENGTH_ATTRIBUTE_ID);
 
-    public void readCurrentPositionTiltPercent100thsAttribute(
-        CurrentPositionTiltPercent100thsAttributeCallback callback) {
-        readCurrentPositionTiltPercent100thsAttribute(chipClusterPtr, callback);
+      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 subscribeCurrentPositionTiltPercent100thsAttribute(
-        CurrentPositionTiltPercent100thsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentPositionTiltPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMinPINCodeLengthAttribute(
+        IntegerAttributeCallback callback, int minInterval, int 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 readInstalledOpenLimitLiftAttribute(
+    public void readMaxRFIDCodeLengthAttribute(
         IntegerAttributeCallback callback) {
-        readInstalledOpenLimitLiftAttribute(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 subscribeInstalledOpenLimitLiftAttribute(
+    public void subscribeMaxRFIDCodeLengthAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInstalledOpenLimitLiftAttribute(chipClusterPtr, callback, minInterval, 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 readInstalledClosedLimitLiftAttribute(
+    public void readMinRFIDCodeLengthAttribute(
         IntegerAttributeCallback callback) {
-        readInstalledClosedLimitLiftAttribute(chipClusterPtr, 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 subscribeInstalledClosedLimitLiftAttribute(
+    public void subscribeMinRFIDCodeLengthAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInstalledClosedLimitLiftAttribute(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 readInstalledOpenLimitTiltAttribute(
+    public void readCredentialRulesSupportAttribute(
         IntegerAttributeCallback callback) {
-        readInstalledOpenLimitTiltAttribute(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 subscribeInstalledOpenLimitTiltAttribute(
+    public void subscribeCredentialRulesSupportAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInstalledOpenLimitTiltAttribute(chipClusterPtr, callback, minInterval, 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 readInstalledClosedLimitTiltAttribute(
+    public void readNumberOfCredentialsSupportedPerUserAttribute(
         IntegerAttributeCallback callback) {
-        readInstalledClosedLimitTiltAttribute(chipClusterPtr, 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 subscribeInstalledClosedLimitTiltAttribute(
+    public void subscribeNumberOfCredentialsSupportedPerUserAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInstalledClosedLimitTiltAttribute(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 readModeAttribute(
-        IntegerAttributeCallback callback) {
-        readModeAttribute(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 writeModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeModeAttribute(chipClusterPtr, callback, value, null);
+    public void writeLanguageAttribute(DefaultClusterCallback callback, String value) {
+      writeLanguageAttribute(callback, value, 0);
     }
 
-    public void writeModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeModeAttribute(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 subscribeModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeLanguageAttribute(
+        CharStringAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LANGUAGE_ATTRIBUTE_ID);
 
-    public void readSafetyStatusAttribute(
-        IntegerAttributeCallback callback) {
-        readSafetyStatusAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            String value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LANGUAGE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeSafetyStatusAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSafetyStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readLEDSettingsAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, L_E_D_SETTINGS_ATTRIBUTE_ID);
 
-    public void readGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback) {
-        readGeneratedCommandListAttribute(chipClusterPtr, callback);
+      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 subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeLEDSettingsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeLEDSettingsAttribute(callback, value, 0);
     }
 
-    public void readAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback) {
-        readAcceptedCommandListAttribute(chipClusterPtr, callback);
+    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 subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeLEDSettingsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, L_E_D_SETTINGS_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);
+          }
+        }, L_E_D_SETTINGS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeEventListAttribute(
-        EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readAutoRelockTimeAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AUTO_RELOCK_TIME_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);
+          }
+        }, AUTO_RELOCK_TIME_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeAutoRelockTimeAttribute(DefaultClusterCallback callback, Long value) {
+      writeAutoRelockTimeAttribute(callback, value, 0);
     }
 
-    public void readFeatureMapAttribute(
-        LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+    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 subscribeFeatureMapAttribute(
+    public void subscribeAutoRelockTimeAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, 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 readClusterRevisionAttribute(
+    public void readSoundVolumeAttribute(
         IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOUND_VOLUME_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);
+          }
+        }, SOUND_VOLUME_ATTRIBUTE_ID, true);
     }
 
-    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);
+    public void writeSoundVolumeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSoundVolumeAttribute(callback, value, 0);
+    }
 
-    private native void readInstalledOpenLimitLiftAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeSoundVolumeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), SOUND_VOLUME_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeInstalledOpenLimitLiftAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeSoundVolumeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SOUND_VOLUME_ATTRIBUTE_ID);
 
-    private native void readInstalledClosedLimitLiftAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SOUND_VOLUME_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeInstalledClosedLimitLiftAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readOperatingModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATING_MODE_ATTRIBUTE_ID);
 
-    private native void readInstalledOpenLimitTiltAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      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);
+    }
 
-    private native void subscribeInstalledOpenLimitTiltAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeOperatingModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOperatingModeAttribute(callback, value, 0);
+    }
 
-    private native void readInstalledClosedLimitTiltAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeOperatingModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), OPERATING_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeInstalledClosedLimitTiltAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeOperatingModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATING_MODE_ATTRIBUTE_ID);
 
-    private native void readModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OPERATING_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void writeModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readSupportedOperatingModesAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_OPERATING_MODES_ATTRIBUTE_ID);
 
-    private native void subscribeModeAttribute(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);
+          }
+        }, SUPPORTED_OPERATING_MODES_ATTRIBUTE_ID, true);
+    }
 
-    private native void readSafetyStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeSupportedOperatingModesAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_OPERATING_MODES_ATTRIBUTE_ID);
 
-    private native void subscribeSafetyStatusAttribute(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);
+          }
+        }, SUPPORTED_OPERATING_MODES_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void readDefaultConfigurationRegisterAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_CONFIGURATION_REGISTER_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);
+          }
+        }, DEFAULT_CONFIGURATION_REGISTER_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void subscribeDefaultConfigurationRegisterAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DEFAULT_CONFIGURATION_REGISTER_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);
+          }
+        }, DEFAULT_CONFIGURATION_REGISTER_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void readEnableLocalProgrammingAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENABLE_LOCAL_PROGRAMMING_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) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ENABLE_LOCAL_PROGRAMMING_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void writeEnableLocalProgrammingAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeEnableLocalProgrammingAttribute(callback, value, 0);
+    }
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+    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);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeEnableLocalProgrammingAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENABLE_LOCAL_PROGRAMMING_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) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ENABLE_LOCAL_PROGRAMMING_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readEnableOneTouchLockingAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENABLE_ONE_TOUCH_LOCKING_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) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ENABLE_ONE_TOUCH_LOCKING_ATTRIBUTE_ID, true);
+    }
 
-  public static class BarrierControlCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 259L;
+    public void writeEnableOneTouchLockingAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeEnableOneTouchLockingAttribute(callback, value, 0);
+    }
 
-    public BarrierControlCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    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);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void subscribeEnableOneTouchLockingAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENABLE_ONE_TOUCH_LOCKING_ATTRIBUTE_ID);
 
-    public void barrierControlGoToPercent(DefaultClusterCallback callback, Integer percentOpen) {
-      barrierControlGoToPercent(chipClusterPtr, callback, percentOpen, null);
+      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 barrierControlGoToPercent(DefaultClusterCallback callback, Integer percentOpen, int timedInvokeTimeoutMs) {
-      barrierControlGoToPercent(chipClusterPtr, callback, percentOpen, timedInvokeTimeoutMs);
-    }
+    public void readEnableInsideStatusLEDAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENABLE_INSIDE_STATUS_L_E_D_ATTRIBUTE_ID);
 
-    public void barrierControlStop(DefaultClusterCallback callback) {
-      barrierControlStop(chipClusterPtr, callback, null);
+      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 barrierControlStop(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      barrierControlStop(chipClusterPtr, callback, timedInvokeTimeoutMs);
+    public void writeEnableInsideStatusLEDAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeEnableInsideStatusLEDAttribute(callback, value, 0);
     }
 
-    private native void barrierControlGoToPercent(long chipClusterPtr, DefaultClusterCallback callback, Integer percentOpen, @Nullable Integer timedInvokeTimeoutMs);
+    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);
+    }
 
-    private native void barrierControlStop(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeEnableInsideStatusLEDAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENABLE_INSIDE_STATUS_L_E_D_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) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, ENABLE_INSIDE_STATUS_L_E_D_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readEnablePrivacyModeButtonAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ENABLE_PRIVACY_MODE_BUTTON_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) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, ENABLE_PRIVACY_MODE_BUTTON_ATTRIBUTE_ID, true);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public void writeEnablePrivacyModeButtonAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeEnablePrivacyModeButtonAttribute(callback, value, 0);
     }
 
-    public void readBarrierMovingStateAttribute(
-        IntegerAttributeCallback callback) {
-        readBarrierMovingStateAttribute(chipClusterPtr, callback);
+    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 subscribeBarrierMovingStateAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierMovingStateAttribute(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 readBarrierSafetyStatusAttribute(
+    public void readLocalProgrammingFeaturesAttribute(
         IntegerAttributeCallback callback) {
-        readBarrierSafetyStatusAttribute(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 subscribeBarrierSafetyStatusAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierSafetyStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeLocalProgrammingFeaturesAttribute(DefaultClusterCallback callback, Integer value) {
+      writeLocalProgrammingFeaturesAttribute(callback, value, 0);
     }
 
-    public void readBarrierCapabilitiesAttribute(
-        IntegerAttributeCallback callback) {
-        readBarrierCapabilitiesAttribute(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 subscribeBarrierCapabilitiesAttribute(
+    public void subscribeLocalProgrammingFeaturesAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierCapabilitiesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LOCAL_PROGRAMMING_FEATURES_ATTRIBUTE_ID);
+
+      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 readBarrierOpenEventsAttribute(
+    public void readWrongCodeEntryLimitAttribute(
         IntegerAttributeCallback callback) {
-        readBarrierOpenEventsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WRONG_CODE_ENTRY_LIMIT_ATTRIBUTE_ID);
+
+      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 writeBarrierOpenEventsAttribute(DefaultClusterCallback callback, Integer value) {
-        writeBarrierOpenEventsAttribute(chipClusterPtr, callback, value, null);
+    public void writeWrongCodeEntryLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeWrongCodeEntryLimitAttribute(callback, value, 0);
     }
 
-    public void writeBarrierOpenEventsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeBarrierOpenEventsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    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 subscribeBarrierOpenEventsAttribute(
+    public void subscribeWrongCodeEntryLimitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierOpenEventsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WRONG_CODE_ENTRY_LIMIT_ATTRIBUTE_ID);
+
+      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 readBarrierCloseEventsAttribute(
+    public void readUserCodeTemporaryDisableTimeAttribute(
         IntegerAttributeCallback callback) {
-        readBarrierCloseEventsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, USER_CODE_TEMPORARY_DISABLE_TIME_ATTRIBUTE_ID);
+
+      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 writeBarrierCloseEventsAttribute(DefaultClusterCallback callback, Integer value) {
-        writeBarrierCloseEventsAttribute(chipClusterPtr, callback, value, null);
+    public void writeUserCodeTemporaryDisableTimeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeUserCodeTemporaryDisableTimeAttribute(callback, value, 0);
     }
 
-    public void writeBarrierCloseEventsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeBarrierCloseEventsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    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 subscribeBarrierCloseEventsAttribute(
+    public void subscribeUserCodeTemporaryDisableTimeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierCloseEventsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, USER_CODE_TEMPORARY_DISABLE_TIME_ATTRIBUTE_ID);
 
-    public void readBarrierCommandOpenEventsAttribute(
-        IntegerAttributeCallback callback) {
-        readBarrierCommandOpenEventsAttribute(chipClusterPtr, callback);
+      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 writeBarrierCommandOpenEventsAttribute(DefaultClusterCallback callback, Integer value) {
-        writeBarrierCommandOpenEventsAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readSendPINOverTheAirAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SEND_P_I_N_OVER_THE_AIR_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) {
+            Boolean value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, SEND_P_I_N_OVER_THE_AIR_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeBarrierCommandOpenEventsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierCommandOpenEventsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeSendPINOverTheAirAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeSendPINOverTheAirAttribute(callback, value, 0);
     }
 
-    public void readBarrierCommandCloseEventsAttribute(
-        IntegerAttributeCallback callback) {
-        readBarrierCommandCloseEventsAttribute(chipClusterPtr, callback);
+    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 writeBarrierCommandCloseEventsAttribute(DefaultClusterCallback callback, Integer value) {
-        writeBarrierCommandCloseEventsAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void subscribeSendPINOverTheAirAttribute(
+        BooleanAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SEND_P_I_N_OVER_THE_AIR_ATTRIBUTE_ID);
 
-    public void writeBarrierCommandCloseEventsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeBarrierCommandCloseEventsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      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 subscribeBarrierCommandCloseEventsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierCommandCloseEventsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readRequirePINforRemoteOperationAttribute(
+        BooleanAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REQUIRE_P_I_NFOR_REMOTE_OPERATION_ATTRIBUTE_ID);
 
-    public void readBarrierOpenPeriodAttribute(
-        IntegerAttributeCallback callback) {
-        readBarrierOpenPeriodAttribute(chipClusterPtr, callback);
+      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 writeBarrierOpenPeriodAttribute(DefaultClusterCallback callback, Integer value) {
-        writeBarrierOpenPeriodAttribute(chipClusterPtr, callback, value, null);
+    public void writeRequirePINforRemoteOperationAttribute(DefaultClusterCallback callback, Boolean value) {
+      writeRequirePINforRemoteOperationAttribute(callback, value, 0);
     }
 
-    public void writeBarrierOpenPeriodAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeBarrierOpenPeriodAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    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 subscribeBarrierOpenPeriodAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierOpenPeriodAttribute(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);
 
-    public void readBarrierClosePeriodAttribute(
-        IntegerAttributeCallback callback) {
-        readBarrierClosePeriodAttribute(chipClusterPtr, callback);
+      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 writeBarrierClosePeriodAttribute(DefaultClusterCallback callback, Integer value) {
-        writeBarrierClosePeriodAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readExpiringUserTimeoutAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EXPIRING_USER_TIMEOUT_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);
+          }
+        }, EXPIRING_USER_TIMEOUT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeBarrierClosePeriodAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierClosePeriodAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeExpiringUserTimeoutAttribute(DefaultClusterCallback callback, Integer value) {
+      writeExpiringUserTimeoutAttribute(callback, value, 0);
     }
 
-    public void readBarrierPositionAttribute(
-        IntegerAttributeCallback callback) {
-        readBarrierPositionAttribute(chipClusterPtr, callback);
+    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 subscribeBarrierPositionAttribute(
+    public void subscribeExpiringUserTimeoutAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBarrierPositionAttribute(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 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 readBarrierMovingStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  public static class WindowCoveringCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 258L;
 
-    private native void subscribeBarrierMovingStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    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;
 
-    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);
+    public WindowCoveringCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void subscribeBarrierCommandOpenEventsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void readBarrierCommandCloseEventsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void upOrOpen(DefaultClusterCallback callback) {
+      upOrOpen(callback, 0);
+    }
 
-    private native void writeBarrierCommandCloseEventsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void upOrOpen(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    private native void subscribeBarrierCommandCloseEventsAttribute(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 readBarrierOpenPeriodAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void downOrClose(DefaultClusterCallback callback) {
+      downOrClose(callback, 0);
+    }
 
-    private native void writeBarrierOpenPeriodAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void downOrClose(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);
+    public void stopMotion(DefaultClusterCallback callback) {
+      stopMotion(callback, 0);
+    }
 
-    private native void writeBarrierClosePeriodAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void stopMotion(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
 
-    private native void subscribeBarrierClosePeriodAttribute(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 readBarrierPositionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void goToLiftValue(DefaultClusterCallback callback, Integer liftValue) {
+      goToLiftValue(callback, liftValue, 0);
+    }
 
-    private native void subscribeBarrierPositionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void goToLiftValue(DefaultClusterCallback callback, Integer liftValue, int timedInvokeTimeoutMs) {
+      final long commandId = 4L;
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long liftValueFieldID = 0L;
+      BaseTLVType liftValuetlvValue = new UIntType(liftValue);
+      elements.add(new StructElement(liftValueFieldID, liftValuetlvValue));
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback 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 readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void goToLiftPercentage(DefaultClusterCallback callback, Integer liftPercent100thsValue) {
+      goToLiftPercentage(callback, liftPercent100thsValue, 0);
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public void goToLiftPercentage(DefaultClusterCallback callback, Integer liftPercent100thsValue, int timedInvokeTimeoutMs) {
+      final long commandId = 5L;
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long liftPercent100thsValueFieldID = 0L;
+      BaseTLVType liftPercent100thsValuetlvValue = new UIntType(liftPercent100thsValue);
+      elements.add(new StructElement(liftPercent100thsValueFieldID, liftPercent100thsValuetlvValue));
 
-    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 goToTiltValue(DefaultClusterCallback callback, Integer tiltValue) {
+      goToTiltValue(callback, tiltValue, 0);
+    }
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+    public void goToTiltValue(DefaultClusterCallback callback, Integer tiltValue, int timedInvokeTimeoutMs) {
+      final long commandId = 7L;
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long tiltValueFieldID = 0L;
+      BaseTLVType tiltValuetlvValue = new UIntType(tiltValue);
+      elements.add(new StructElement(tiltValueFieldID, tiltValuetlvValue));
 
-    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 goToTiltPercentage(DefaultClusterCallback callback, Integer tiltPercent100thsValue) {
+      goToTiltPercentage(callback, tiltPercent100thsValue, 0);
+    }
 
-    private native void subscribeClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
-  }
+    public void goToTiltPercentage(DefaultClusterCallback callback, Integer tiltPercent100thsValue, int timedInvokeTimeoutMs) {
+      final long commandId = 8L;
 
-  public static class PumpConfigurationAndControlCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 512L;
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long tiltPercent100thsValueFieldID = 0L;
+      BaseTLVType tiltPercent100thsValuetlvValue = new UIntType(tiltPercent100thsValue);
+      elements.add(new StructElement(tiltPercent100thsValueFieldID, tiltPercent100thsValuetlvValue));
 
-    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 {
+    public interface CurrentPositionLiftAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MaxSpeedAttributeCallback {
+    public interface CurrentPositionTiltAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MaxFlowAttributeCallback {
+    public interface CurrentPositionLiftPercentageAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MinConstPressureAttributeCallback {
+    public interface CurrentPositionTiltPercentageAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MaxConstPressureAttributeCallback {
+    public interface TargetPositionLiftPercent100thsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MinCompPressureAttributeCallback {
+    public interface TargetPositionTiltPercent100thsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MaxCompPressureAttributeCallback {
+    public interface CurrentPositionLiftPercent100thsAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MinConstSpeedAttributeCallback {
+    public interface CurrentPositionTiltPercent100thsAttributeCallback extends BaseAttributeCallback {
       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 GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public interface MinConstFlowAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public interface MaxConstFlowAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public interface MinConstTempAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public interface MaxConstTempAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readTypeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TYPE_ATTRIBUTE_ID);
 
-    public interface CapacityAttributeCallback {
-      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);
+          }
+        }, TYPE_ATTRIBUTE_ID, true);
     }
 
-    public interface SpeedAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribeTypeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TYPE_ATTRIBUTE_ID);
 
-    public interface LifetimeRunningHoursAttributeCallback {
-      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);
+          }
+        }, TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface PowerAttributeCallback {
-      void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readPhysicalClosedLimitLiftAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_CLOSED_LIMIT_LIFT_ATTRIBUTE_ID);
 
-    public interface LifetimeEnergyConsumedAttributeCallback {
-      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);
+          }
+        }, PHYSICAL_CLOSED_LIMIT_LIFT_ATTRIBUTE_ID, true);
     }
 
-    public interface GeneratedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void subscribePhysicalClosedLimitLiftAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_CLOSED_LIMIT_LIFT_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);
+          }
+        }, PHYSICAL_CLOSED_LIMIT_LIFT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
-    }
+    public void readPhysicalClosedLimitTiltAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_CLOSED_LIMIT_TILT_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);
+          }
+        }, PHYSICAL_CLOSED_LIMIT_TILT_ATTRIBUTE_ID, true);
     }
 
-    public void readMaxPressureAttribute(
-        MaxPressureAttributeCallback callback) {
-        readMaxPressureAttribute(chipClusterPtr, callback);
-    }
+    public void subscribePhysicalClosedLimitTiltAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_CLOSED_LIMIT_TILT_ATTRIBUTE_ID);
 
-    public void subscribeMaxPressureAttribute(
-        MaxPressureAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxPressureAttribute(chipClusterPtr, callback, minInterval, 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);
     }
 
-    public void readMaxSpeedAttribute(
-        MaxSpeedAttributeCallback callback) {
-        readMaxSpeedAttribute(chipClusterPtr, callback);
-    }
+    public void readCurrentPositionLiftAttribute(
+        CurrentPositionLiftAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_LIFT_ATTRIBUTE_ID);
 
-    public void subscribeMaxSpeedAttribute(
-        MaxSpeedAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxSpeedAttribute(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_POSITION_LIFT_ATTRIBUTE_ID, true);
     }
 
-    public void readMaxFlowAttribute(
-        MaxFlowAttributeCallback callback) {
-        readMaxFlowAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeCurrentPositionLiftAttribute(
+        CurrentPositionLiftAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_LIFT_ATTRIBUTE_ID);
 
-    public void subscribeMaxFlowAttribute(
-        MaxFlowAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxFlowAttribute(chipClusterPtr, callback, minInterval, 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);
     }
 
-    public void readMinConstPressureAttribute(
-        MinConstPressureAttributeCallback callback) {
-        readMinConstPressureAttribute(chipClusterPtr, callback);
-    }
+    public void readCurrentPositionTiltAttribute(
+        CurrentPositionTiltAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_TILT_ATTRIBUTE_ID);
 
-    public void subscribeMinConstPressureAttribute(
-        MinConstPressureAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinConstPressureAttribute(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_POSITION_TILT_ATTRIBUTE_ID, true);
     }
 
-    public void readMaxConstPressureAttribute(
-        MaxConstPressureAttributeCallback callback) {
-        readMaxConstPressureAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeCurrentPositionTiltAttribute(
+        CurrentPositionTiltAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_TILT_ATTRIBUTE_ID);
 
-    public void subscribeMaxConstPressureAttribute(
-        MaxConstPressureAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxConstPressureAttribute(chipClusterPtr, callback, minInterval, 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);
     }
 
-    public void readMinCompPressureAttribute(
-        MinCompPressureAttributeCallback callback) {
-        readMinCompPressureAttribute(chipClusterPtr, callback);
-    }
+    public void readNumberOfActuationsLiftAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_ACTUATIONS_LIFT_ATTRIBUTE_ID);
 
-    public void subscribeMinCompPressureAttribute(
-        MinCompPressureAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinCompPressureAttribute(chipClusterPtr, callback, minInterval, 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);
     }
 
-    public void readMaxCompPressureAttribute(
-        MaxCompPressureAttributeCallback callback) {
-        readMaxCompPressureAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeNumberOfActuationsLiftAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_ACTUATIONS_LIFT_ATTRIBUTE_ID);
 
-    public void subscribeMaxCompPressureAttribute(
-        MaxCompPressureAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxCompPressureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      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);
     }
 
-    public void readMinConstSpeedAttribute(
-        MinConstSpeedAttributeCallback callback) {
-        readMinConstSpeedAttribute(chipClusterPtr, callback);
-    }
+    public void readNumberOfActuationsTiltAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_ACTUATIONS_TILT_ATTRIBUTE_ID);
 
-    public void subscribeMinConstSpeedAttribute(
-        MinConstSpeedAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinConstSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      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);
     }
 
-    public void readMaxConstSpeedAttribute(
-        MaxConstSpeedAttributeCallback callback) {
-        readMaxConstSpeedAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeNumberOfActuationsTiltAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_ACTUATIONS_TILT_ATTRIBUTE_ID);
 
-    public void subscribeMaxConstSpeedAttribute(
-        MaxConstSpeedAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxConstSpeedAttribute(chipClusterPtr, callback, minInterval, 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);
     }
 
-    public void readMinConstFlowAttribute(
-        MinConstFlowAttributeCallback callback) {
-        readMinConstFlowAttribute(chipClusterPtr, callback);
-    }
+    public void readConfigStatusAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONFIG_STATUS_ATTRIBUTE_ID);
 
-    public void subscribeMinConstFlowAttribute(
-        MinConstFlowAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinConstFlowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      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);
     }
 
-    public void readMaxConstFlowAttribute(
-        MaxConstFlowAttributeCallback callback) {
-        readMaxConstFlowAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeConfigStatusAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONFIG_STATUS_ATTRIBUTE_ID);
 
-    public void subscribeMaxConstFlowAttribute(
-        MaxConstFlowAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxConstFlowAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CONFIG_STATUS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMinConstTempAttribute(
-        MinConstTempAttributeCallback callback) {
-        readMinConstTempAttribute(chipClusterPtr, callback);
-    }
+    public void readCurrentPositionLiftPercentageAttribute(
+        CurrentPositionLiftPercentageAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_LIFT_PERCENTAGE_ATTRIBUTE_ID);
 
-    public void subscribeMinConstTempAttribute(
-        MinConstTempAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinConstTempAttribute(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_POSITION_LIFT_PERCENTAGE_ATTRIBUTE_ID, true);
     }
 
-    public void readMaxConstTempAttribute(
-        MaxConstTempAttributeCallback callback) {
-        readMaxConstTempAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeCurrentPositionLiftPercentageAttribute(
+        CurrentPositionLiftPercentageAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_LIFT_PERCENTAGE_ATTRIBUTE_ID);
 
-    public void subscribeMaxConstTempAttribute(
-        MaxConstTempAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxConstTempAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      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);
     }
 
-    public void readPumpStatusAttribute(
-        IntegerAttributeCallback callback) {
-        readPumpStatusAttribute(chipClusterPtr, callback);
-    }
+    public void readCurrentPositionTiltPercentageAttribute(
+        CurrentPositionTiltPercentageAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_TILT_PERCENTAGE_ATTRIBUTE_ID);
 
-    public void subscribePumpStatusAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePumpStatusAttribute(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_POSITION_TILT_PERCENTAGE_ATTRIBUTE_ID, true);
     }
 
-    public void readEffectiveOperationModeAttribute(
-        IntegerAttributeCallback callback) {
-        readEffectiveOperationModeAttribute(chipClusterPtr, callback);
-    }
+    public void subscribeCurrentPositionTiltPercentageAttribute(
+        CurrentPositionTiltPercentageAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_TILT_PERCENTAGE_ATTRIBUTE_ID);
 
-    public void subscribeEffectiveOperationModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEffectiveOperationModeAttribute(chipClusterPtr, callback, minInterval, 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);
     }
 
-    public void readEffectiveControlModeAttribute(
+    public void readOperationalStatusAttribute(
         IntegerAttributeCallback callback) {
-        readEffectiveControlModeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_STATUS_ATTRIBUTE_ID);
+
+      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);
     }
 
-    public void subscribeEffectiveControlModeAttribute(
+    public void subscribeOperationalStatusAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEffectiveControlModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OPERATIONAL_STATUS_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);
+          }
+        }, OPERATIONAL_STATUS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeCapacityAttribute(
-        CapacityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCapacityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readTargetPositionLiftPercent100thsAttribute(
+        TargetPositionLiftPercent100thsAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGET_POSITION_LIFT_PERCENT100THS_ATTRIBUTE_ID);
 
-    public void readSpeedAttribute(
-        SpeedAttributeCallback callback) {
-        readSpeedAttribute(chipClusterPtr, callback);
+      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);
     }
 
-    public void subscribeSpeedAttribute(
-        SpeedAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeTargetPositionLiftPercent100thsAttribute(
+        TargetPositionLiftPercent100thsAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGET_POSITION_LIFT_PERCENT100THS_ATTRIBUTE_ID);
 
-    public void readLifetimeRunningHoursAttribute(
-        LifetimeRunningHoursAttributeCallback callback) {
-        readLifetimeRunningHoursAttribute(chipClusterPtr, callback);
+      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);
     }
 
-    public void writeLifetimeRunningHoursAttribute(DefaultClusterCallback callback, Long value) {
-        writeLifetimeRunningHoursAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void readTargetPositionTiltPercent100thsAttribute(
+        TargetPositionTiltPercent100thsAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGET_POSITION_TILT_PERCENT100THS_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 Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, TARGET_POSITION_TILT_PERCENT100THS_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeLifetimeRunningHoursAttribute(
-        LifetimeRunningHoursAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLifetimeRunningHoursAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeTargetPositionTiltPercent100thsAttribute(
+        TargetPositionTiltPercent100thsAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGET_POSITION_TILT_PERCENT100THS_ATTRIBUTE_ID);
 
-    public void readPowerAttribute(
-        PowerAttributeCallback callback) {
-        readPowerAttribute(chipClusterPtr, 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);
     }
 
-    public void subscribePowerAttribute(
-        PowerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePowerAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readEndProductTypeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, END_PRODUCT_TYPE_ATTRIBUTE_ID);
 
-    public void readLifetimeEnergyConsumedAttribute(
-        LifetimeEnergyConsumedAttributeCallback callback) {
-        readLifetimeEnergyConsumedAttribute(chipClusterPtr, callback);
+      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);
     }
 
-    public void writeLifetimeEnergyConsumedAttribute(DefaultClusterCallback callback, Long value) {
-        writeLifetimeEnergyConsumedAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void subscribeEndProductTypeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, END_PRODUCT_TYPE_ATTRIBUTE_ID);
 
-    public void writeLifetimeEnergyConsumedAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeLifetimeEnergyConsumedAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, END_PRODUCT_TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeLifetimeEnergyConsumedAttribute(
-        LifetimeEnergyConsumedAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLifetimeEnergyConsumedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readCurrentPositionLiftPercent100thsAttribute(
+        CurrentPositionLiftPercent100thsAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_LIFT_PERCENT100THS_ATTRIBUTE_ID);
 
-    public void readOperationModeAttribute(
-        IntegerAttributeCallback callback) {
-        readOperationModeAttribute(chipClusterPtr, callback);
+      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);
     }
 
-    public void writeOperationModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOperationModeAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeCurrentPositionLiftPercent100thsAttribute(
+        CurrentPositionLiftPercent100thsAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_LIFT_PERCENT100THS_ATTRIBUTE_ID);
+
+      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);
     }
 
-    public void writeOperationModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOperationModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readCurrentPositionTiltPercent100thsAttribute(
+        CurrentPositionTiltPercent100thsAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_TILT_PERCENT100THS_ATTRIBUTE_ID);
+
+      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);
     }
 
-    public void subscribeOperationModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOperationModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentPositionTiltPercent100thsAttribute(
+        CurrentPositionTiltPercent100thsAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_POSITION_TILT_PERCENT100THS_ATTRIBUTE_ID);
+
+      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);
     }
 
-    public void readControlModeAttribute(
+    public void readInstalledOpenLimitLiftAttribute(
         IntegerAttributeCallback callback) {
-        readControlModeAttribute(chipClusterPtr, callback);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTALLED_OPEN_LIMIT_LIFT_ATTRIBUTE_ID);
 
-    public void writeControlModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeControlModeAttribute(chipClusterPtr, callback, value, null);
+      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);
     }
 
-    public void writeControlModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeControlModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void subscribeInstalledOpenLimitLiftAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTALLED_OPEN_LIMIT_LIFT_ATTRIBUTE_ID);
+
+      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);
     }
 
-    public void subscribeControlModeAttribute(
+    public void readInstalledClosedLimitLiftAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTALLED_CLOSED_LIMIT_LIFT_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void subscribeInstalledClosedLimitLiftAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTALLED_CLOSED_LIMIT_LIFT_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void readInstalledOpenLimitTiltAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTALLED_OPEN_LIMIT_TILT_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void subscribeInstalledOpenLimitTiltAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTALLED_OPEN_LIMIT_TILT_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void readInstalledClosedLimitTiltAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTALLED_CLOSED_LIMIT_TILT_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void subscribeInstalledClosedLimitTiltAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INSTALLED_CLOSED_LIMIT_TILT_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void readModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MODE_ATTRIBUTE_ID);
+
+      readAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MODE_ATTRIBUTE_ID, true);
+    }
+
+    public void writeModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeModeAttribute(callback, value, 0);
+    }
+
+    public void writeModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
+
+    public void subscribeModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MODE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readSafetyStatusAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SAFETY_STATUS_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void subscribeSafetyStatusAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeControlModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SAFETY_STATUS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SAFETY_STATUS_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 BarrierControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 259L;
+
+    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
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
+
+    public void barrierControlGoToPercent(DefaultClusterCallback callback, Integer percentOpen) {
+      barrierControlGoToPercent(callback, percentOpen, 0);
     }
 
-    private native void readMaxPressureAttribute(long chipClusterPtr, MaxPressureAttributeCallback callback);
+    public void barrierControlGoToPercent(DefaultClusterCallback callback, Integer percentOpen, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
 
-    private native void subscribeMaxPressureAttribute(long chipClusterPtr, MaxPressureAttributeCallback callback, int minInterval, int maxInterval);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long percentOpenFieldID = 0L;
+      BaseTLVType percentOpentlvValue = new UIntType(percentOpen);
+      elements.add(new StructElement(percentOpenFieldID, percentOpentlvValue));
 
-    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);
+    public void barrierControlStop(DefaultClusterCallback callback) {
+      barrierControlStop(callback, 0);
+    }
 
-    private native void readMaxFlowAttribute(long chipClusterPtr, MaxFlowAttributeCallback callback);
+    public void barrierControlStop(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
 
-    private native void subscribeMaxFlowAttribute(long chipClusterPtr, MaxFlowAttributeCallback 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 readMinConstPressureAttribute(long chipClusterPtr, MinConstPressureAttributeCallback callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeMinConstPressureAttribute(long chipClusterPtr, MinConstPressureAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readMaxConstPressureAttribute(long chipClusterPtr, MaxConstPressureAttributeCallback callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeMaxConstPressureAttribute(long chipClusterPtr, MaxConstPressureAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readMinCompPressureAttribute(long chipClusterPtr, MinCompPressureAttributeCallback callback);
+    public void readBarrierMovingStateAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_MOVING_STATE_ATTRIBUTE_ID);
 
-    private native void subscribeMinCompPressureAttribute(long chipClusterPtr, MinCompPressureAttributeCallback 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);
+          }
+        }, BARRIER_MOVING_STATE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMaxCompPressureAttribute(long chipClusterPtr, MaxCompPressureAttributeCallback callback);
+    public void subscribeBarrierMovingStateAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_MOVING_STATE_ATTRIBUTE_ID);
 
-    private native void subscribeMaxCompPressureAttribute(long chipClusterPtr, MaxCompPressureAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BARRIER_MOVING_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMinConstSpeedAttribute(long chipClusterPtr, MinConstSpeedAttributeCallback callback);
+    public void readBarrierSafetyStatusAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_SAFETY_STATUS_ATTRIBUTE_ID);
 
-    private native void subscribeMinConstSpeedAttribute(long chipClusterPtr, MinConstSpeedAttributeCallback 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);
+          }
+        }, BARRIER_SAFETY_STATUS_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMaxConstSpeedAttribute(long chipClusterPtr, MaxConstSpeedAttributeCallback callback);
+    public void subscribeBarrierSafetyStatusAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_SAFETY_STATUS_ATTRIBUTE_ID);
 
-    private native void subscribeMaxConstSpeedAttribute(long chipClusterPtr, MaxConstSpeedAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BARRIER_SAFETY_STATUS_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMinConstFlowAttribute(long chipClusterPtr, MinConstFlowAttributeCallback callback);
+    public void readBarrierCapabilitiesAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_CAPABILITIES_ATTRIBUTE_ID);
 
-    private native void subscribeMinConstFlowAttribute(long chipClusterPtr, MinConstFlowAttributeCallback 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);
+          }
+        }, BARRIER_CAPABILITIES_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMaxConstFlowAttribute(long chipClusterPtr, MaxConstFlowAttributeCallback callback);
+    public void subscribeBarrierCapabilitiesAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_CAPABILITIES_ATTRIBUTE_ID);
 
-    private native void subscribeMaxConstFlowAttribute(long chipClusterPtr, MaxConstFlowAttributeCallback callback, int minInterval, int maxInterval);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BARRIER_CAPABILITIES_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMinConstTempAttribute(long chipClusterPtr, MinConstTempAttributeCallback callback);
+    public void readBarrierOpenEventsAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_OPEN_EVENTS_ATTRIBUTE_ID);
 
-    private native void subscribeMinConstTempAttribute(long chipClusterPtr, MinConstTempAttributeCallback 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);
+          }
+        }, BARRIER_OPEN_EVENTS_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMaxConstTempAttribute(long chipClusterPtr, MaxConstTempAttributeCallback callback);
+    public void writeBarrierOpenEventsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBarrierOpenEventsAttribute(callback, value, 0);
+    }
 
-    private native void subscribeMaxConstTempAttribute(long chipClusterPtr, MaxConstTempAttributeCallback callback, int minInterval, int maxInterval);
+    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);
+    }
 
-    private native void readPumpStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeBarrierOpenEventsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_OPEN_EVENTS_ATTRIBUTE_ID);
 
-    private native void subscribePumpStatusAttribute(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);
+          }
+        }, BARRIER_OPEN_EVENTS_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readEffectiveOperationModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readBarrierCloseEventsAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_CLOSE_EVENTS_ATTRIBUTE_ID);
 
-    private native void subscribeEffectiveOperationModeAttribute(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);
+          }
+        }, BARRIER_CLOSE_EVENTS_ATTRIBUTE_ID, true);
+    }
 
-    private native void readEffectiveControlModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeBarrierCloseEventsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBarrierCloseEventsAttribute(callback, value, 0);
+    }
 
-    private native void subscribeEffectiveControlModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    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);
+    }
 
-    private native void readCapacityAttribute(long chipClusterPtr, CapacityAttributeCallback callback);
+    public void subscribeBarrierCloseEventsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_CLOSE_EVENTS_ATTRIBUTE_ID);
 
-    private native void subscribeCapacityAttribute(long chipClusterPtr, CapacityAttributeCallback callback, int minInterval, int 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);
+    }
 
-    private native void readSpeedAttribute(long chipClusterPtr, SpeedAttributeCallback callback);
+    public void readBarrierCommandOpenEventsAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_COMMAND_OPEN_EVENTS_ATTRIBUTE_ID);
 
-    private native void subscribeSpeedAttribute(long chipClusterPtr, SpeedAttributeCallback 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);
+          }
+        }, BARRIER_COMMAND_OPEN_EVENTS_ATTRIBUTE_ID, true);
+    }
 
-    private native void readLifetimeRunningHoursAttribute(long chipClusterPtr, LifetimeRunningHoursAttributeCallback callback);
+    public void writeBarrierCommandOpenEventsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBarrierCommandOpenEventsAttribute(callback, value, 0);
+    }
 
-    private native void writeLifetimeRunningHoursAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    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);
+    }
 
-    private native void subscribeLifetimeRunningHoursAttribute(long chipClusterPtr, LifetimeRunningHoursAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeBarrierCommandOpenEventsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_COMMAND_OPEN_EVENTS_ATTRIBUTE_ID);
 
-    private native void readPowerAttribute(long chipClusterPtr, PowerAttributeCallback callback);
+      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);
+    }
 
-    private native void subscribePowerAttribute(long chipClusterPtr, PowerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readBarrierCommandCloseEventsAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_COMMAND_CLOSE_EVENTS_ATTRIBUTE_ID);
 
-    private native void readLifetimeEnergyConsumedAttribute(long chipClusterPtr, LifetimeEnergyConsumedAttributeCallback callback);
+      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);
+    }
 
-    private native void writeLifetimeEnergyConsumedAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public void writeBarrierCommandCloseEventsAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBarrierCommandCloseEventsAttribute(callback, value, 0);
+    }
 
-    private native void subscribeLifetimeEnergyConsumedAttribute(long chipClusterPtr, LifetimeEnergyConsumedAttributeCallback callback, int minInterval, int maxInterval);
+    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);
+    }
 
-    private native void readOperationModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeBarrierCommandCloseEventsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_COMMAND_CLOSE_EVENTS_ATTRIBUTE_ID);
 
-    private native void writeOperationModeAttribute(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);
+          }
+        }, BARRIER_COMMAND_CLOSE_EVENTS_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeOperationModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readBarrierOpenPeriodAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_OPEN_PERIOD_ATTRIBUTE_ID);
 
-    private native void readControlModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      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);
+    }
 
-    private native void writeControlModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void writeBarrierOpenPeriodAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBarrierOpenPeriodAttribute(callback, value, 0);
+    }
 
-    private native void subscribeControlModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    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);
+    }
 
-    private native void readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+    public void subscribeBarrierOpenPeriodAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_OPEN_PERIOD_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);
+          }
+        }, BARRIER_OPEN_PERIOD_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+    public void readBarrierClosePeriodAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_CLOSE_PERIOD_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);
+          }
+        }, BARRIER_CLOSE_PERIOD_ATTRIBUTE_ID, true);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    public void writeBarrierClosePeriodAttribute(DefaultClusterCallback callback, Integer value) {
+      writeBarrierClosePeriodAttribute(callback, value, 0);
+    }
 
-    private native void subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int maxInterval);
+    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);
+    }
 
-    private native void readAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback);
+    public void subscribeBarrierClosePeriodAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_CLOSE_PERIOD_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);
+          }
+        }, BARRIER_CLOSE_PERIOD_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readFeatureMapAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void readBarrierPositionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_POSITION_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);
+          }
+        }, BARRIER_POSITION_ATTRIBUTE_ID, true);
+    }
 
-    private native void readClusterRevisionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeBarrierPositionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BARRIER_POSITION_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);
+          }
+        }, BARRIER_POSITION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-  public static class ThermostatCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 513L;
+    public void readGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public ThermostatCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+      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);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void subscribeGeneratedCommandListAttribute(
+        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID);
 
-    public void setpointRaiseLower(DefaultClusterCallback callback, Integer mode, Integer amount) {
-      setpointRaiseLower(chipClusterPtr, callback, mode, amount, 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 setpointRaiseLower(DefaultClusterCallback callback, Integer mode, Integer amount, int timedInvokeTimeoutMs) {
-      setpointRaiseLower(chipClusterPtr, callback, mode, amount, 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 setWeeklySchedule(DefaultClusterCallback callback, Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions) {
-      setWeeklySchedule(chipClusterPtr, callback, numberOfTransitionsForSequence, dayOfWeekForSequence, modeForSequence, transitions, 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 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 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 getWeeklySchedule(GetWeeklyScheduleResponseCallback callback, Integer daysToReturn, Integer modeToReturn) {
-      getWeeklySchedule(chipClusterPtr, callback, daysToReturn, modeToReturn, 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 getWeeklySchedule(GetWeeklyScheduleResponseCallback callback, Integer daysToReturn, Integer modeToReturn, int timedInvokeTimeoutMs) {
-      getWeeklySchedule(chipClusterPtr, callback, daysToReturn, modeToReturn, 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 clearWeeklySchedule(DefaultClusterCallback callback) {
-      clearWeeklySchedule(chipClusterPtr, callback, 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 clearWeeklySchedule(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      clearWeeklySchedule(chipClusterPtr, callback, 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);
     }
 
-    private native void setpointRaiseLower(long chipClusterPtr, DefaultClusterCallback callback, Integer mode, Integer amount, @Nullable Integer timedInvokeTimeoutMs);
+    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);
+    }
 
-    private native void setWeeklySchedule(long chipClusterPtr, DefaultClusterCallback callback, Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions, @Nullable Integer timedInvokeTimeoutMs);
+    public void readClusterRevisionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void getWeeklySchedule(long chipClusterPtr, GetWeeklyScheduleResponseCallback callback, Integer daysToReturn, Integer modeToReturn, @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 clearWeeklySchedule(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+    public void subscribeClusterRevisionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    public interface GetWeeklyScheduleResponseCallback {
-      void onSuccess(Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions);
-      void onError(Exception error);
+      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 LocalTemperatureAttributeCallback {
-      void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+  public static class PumpConfigurationAndControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 512L;
+
+    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;
+
+    public PumpConfigurationAndControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
     }
 
-    public interface OutdoorTemperatureAttributeCallback {
-      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 TemperatureSetpointHoldDurationAttributeCallback {
+    public interface MaxPressureAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface SetpointChangeAmountAttributeCallback {
+    public interface MaxSpeedAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface OccupiedSetbackAttributeCallback {
+    public interface MaxFlowAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface OccupiedSetbackMinAttributeCallback {
+    public interface MinConstPressureAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface OccupiedSetbackMaxAttributeCallback {
+    public interface MaxConstPressureAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface UnoccupiedSetbackAttributeCallback {
+    public interface MinCompPressureAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface UnoccupiedSetbackMinAttributeCallback {
+    public interface MaxCompPressureAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface UnoccupiedSetbackMaxAttributeCallback {
+    public interface MinConstSpeedAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ACCoilTemperatureAttributeCallback {
+    public interface MaxConstSpeedAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable 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 MinConstFlowAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public interface AcceptedCommandListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface MaxConstFlowAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public interface EventListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface MinConstTempAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public interface AttributeListAttributeCallback {
-      void onSuccess(List<Long> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
+    public interface MaxConstTempAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void readLocalTemperatureAttribute(
-        LocalTemperatureAttributeCallback callback) {
-        readLocalTemperatureAttribute(chipClusterPtr, callback);
+    public interface CapacityAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void subscribeLocalTemperatureAttribute(
-        LocalTemperatureAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLocalTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface SpeedAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void readOutdoorTemperatureAttribute(
-        OutdoorTemperatureAttributeCallback callback) {
-        readOutdoorTemperatureAttribute(chipClusterPtr, callback);
+    public interface LifetimeRunningHoursAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void subscribeOutdoorTemperatureAttribute(
-        OutdoorTemperatureAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOutdoorTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface PowerAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void readOccupancyAttribute(
-        IntegerAttributeCallback callback) {
-        readOccupancyAttribute(chipClusterPtr, callback);
+    public interface LifetimeEnergyConsumedAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Long value);
     }
 
-    public void subscribeOccupancyAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOccupancyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readAbsMinHeatSetpointLimitAttribute(
-        IntegerAttributeCallback callback) {
-        readAbsMinHeatSetpointLimitAttribute(chipClusterPtr, callback);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeAbsMinHeatSetpointLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAbsMinHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readAbsMaxHeatSetpointLimitAttribute(
-        IntegerAttributeCallback callback) {
-        readAbsMaxHeatSetpointLimitAttribute(chipClusterPtr, callback);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeAbsMaxHeatSetpointLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAbsMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readMaxPressureAttribute(
+        MaxPressureAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_PRESSURE_ATTRIBUTE_ID);
 
-    public void readAbsMinCoolSetpointLimitAttribute(
-        IntegerAttributeCallback callback) {
-        readAbsMinCoolSetpointLimitAttribute(chipClusterPtr, 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);
     }
 
-    public void subscribeAbsMinCoolSetpointLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAbsMinCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeMaxPressureAttribute(
+        MaxPressureAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_PRESSURE_ATTRIBUTE_ID);
 
-    public void readAbsMaxCoolSetpointLimitAttribute(
-        IntegerAttributeCallback callback) {
-        readAbsMaxCoolSetpointLimitAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_PRESSURE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeAbsMaxCoolSetpointLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAbsMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readMaxSpeedAttribute(
+        MaxSpeedAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_SPEED_ATTRIBUTE_ID);
 
-    public void readPICoolingDemandAttribute(
-        IntegerAttributeCallback callback) {
-        readPICoolingDemandAttribute(chipClusterPtr, callback);
+      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);
     }
 
-    public void subscribePICoolingDemandAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePICoolingDemandAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeMaxSpeedAttribute(
+        MaxSpeedAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_SPEED_ATTRIBUTE_ID);
 
-    public void readPIHeatingDemandAttribute(
-        IntegerAttributeCallback callback) {
-        readPIHeatingDemandAttribute(chipClusterPtr, callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_SPEED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribePIHeatingDemandAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePIHeatingDemandAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readMaxFlowAttribute(
+        MaxFlowAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_FLOW_ATTRIBUTE_ID);
 
-    public void readHVACSystemTypeConfigurationAttribute(
-        IntegerAttributeCallback callback) {
-        readHVACSystemTypeConfigurationAttribute(chipClusterPtr, callback);
+      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);
     }
 
-    public void writeHVACSystemTypeConfigurationAttribute(DefaultClusterCallback callback, Integer value) {
-        writeHVACSystemTypeConfigurationAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void subscribeMaxFlowAttribute(
+        MaxFlowAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_FLOW_ATTRIBUTE_ID);
 
-    public void writeHVACSystemTypeConfigurationAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeHVACSystemTypeConfigurationAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MAX_FLOW_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeHVACSystemTypeConfigurationAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeHVACSystemTypeConfigurationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readMinConstPressureAttribute(
+        MinConstPressureAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_CONST_PRESSURE_ATTRIBUTE_ID);
 
-    public void readLocalTemperatureCalibrationAttribute(
-        IntegerAttributeCallback callback) {
-        readLocalTemperatureCalibrationAttribute(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_PRESSURE_ATTRIBUTE_ID, true);
     }
 
-    public void writeLocalTemperatureCalibrationAttribute(DefaultClusterCallback callback, Integer value) {
-        writeLocalTemperatureCalibrationAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void subscribeMinConstPressureAttribute(
+        MinConstPressureAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_CONST_PRESSURE_ATTRIBUTE_ID);
 
-    public void writeLocalTemperatureCalibrationAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeLocalTemperatureCalibrationAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      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 void subscribeLocalTemperatureCalibrationAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLocalTemperatureCalibrationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readMaxConstPressureAttribute(
+        MaxConstPressureAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_CONST_PRESSURE_ATTRIBUTE_ID);
 
-    public void readOccupiedCoolingSetpointAttribute(
-        IntegerAttributeCallback callback) {
-        readOccupiedCoolingSetpointAttribute(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_PRESSURE_ATTRIBUTE_ID, true);
     }
 
-    public void writeOccupiedCoolingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOccupiedCoolingSetpointAttribute(chipClusterPtr, callback, value, null);
-    }
+    public void subscribeMaxConstPressureAttribute(
+        MaxConstPressureAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_CONST_PRESSURE_ATTRIBUTE_ID);
 
-    public void writeOccupiedCoolingSetpointAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOccupiedCoolingSetpointAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      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 void subscribeOccupiedCoolingSetpointAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOccupiedCoolingSetpointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readMinCompPressureAttribute(
+        MinCompPressureAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_COMP_PRESSURE_ATTRIBUTE_ID);
 
-    public void readOccupiedHeatingSetpointAttribute(
-        IntegerAttributeCallback callback) {
-        readOccupiedHeatingSetpointAttribute(chipClusterPtr, callback);
+      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 void writeOccupiedHeatingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOccupiedHeatingSetpointAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeMinCompPressureAttribute(
+        MinCompPressureAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_COMP_PRESSURE_ATTRIBUTE_ID);
+
+      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 writeOccupiedHeatingSetpointAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOccupiedHeatingSetpointAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readMaxCompPressureAttribute(
+        MaxCompPressureAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_COMP_PRESSURE_ATTRIBUTE_ID);
+
+      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 subscribeOccupiedHeatingSetpointAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOccupiedHeatingSetpointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMaxCompPressureAttribute(
+        MaxCompPressureAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_COMP_PRESSURE_ATTRIBUTE_ID);
+
+      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 readUnoccupiedCoolingSetpointAttribute(
-        IntegerAttributeCallback callback) {
-        readUnoccupiedCoolingSetpointAttribute(chipClusterPtr, callback);
+    public void readMinConstSpeedAttribute(
+        MinConstSpeedAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_CONST_SPEED_ATTRIBUTE_ID);
+
+      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 writeUnoccupiedCoolingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
-        writeUnoccupiedCoolingSetpointAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeMinConstSpeedAttribute(
+        MinConstSpeedAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_CONST_SPEED_ATTRIBUTE_ID);
+
+      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 writeUnoccupiedCoolingSetpointAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeUnoccupiedCoolingSetpointAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readMaxConstSpeedAttribute(
+        MaxConstSpeedAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_CONST_SPEED_ATTRIBUTE_ID);
+
+      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 subscribeUnoccupiedCoolingSetpointAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUnoccupiedCoolingSetpointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMaxConstSpeedAttribute(
+        MaxConstSpeedAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_CONST_SPEED_ATTRIBUTE_ID);
+
+      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 readUnoccupiedHeatingSetpointAttribute(
-        IntegerAttributeCallback callback) {
-        readUnoccupiedHeatingSetpointAttribute(chipClusterPtr, callback);
+    public void readMinConstFlowAttribute(
+        MinConstFlowAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_CONST_FLOW_ATTRIBUTE_ID);
+
+      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 writeUnoccupiedHeatingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
-        writeUnoccupiedHeatingSetpointAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeMinConstFlowAttribute(
+        MinConstFlowAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_CONST_FLOW_ATTRIBUTE_ID);
+
+      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 writeUnoccupiedHeatingSetpointAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeUnoccupiedHeatingSetpointAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readMaxConstFlowAttribute(
+        MaxConstFlowAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_CONST_FLOW_ATTRIBUTE_ID);
+
+      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 subscribeUnoccupiedHeatingSetpointAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUnoccupiedHeatingSetpointAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMaxConstFlowAttribute(
+        MaxConstFlowAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_CONST_FLOW_ATTRIBUTE_ID);
+
+      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 readMinHeatSetpointLimitAttribute(
-        IntegerAttributeCallback callback) {
-        readMinHeatSetpointLimitAttribute(chipClusterPtr, callback);
+    public void readMinConstTempAttribute(
+        MinConstTempAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_CONST_TEMP_ATTRIBUTE_ID);
+
+      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 writeMinHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
-        writeMinHeatSetpointLimitAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeMinConstTempAttribute(
+        MinConstTempAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_CONST_TEMP_ATTRIBUTE_ID);
+
+      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);
     }
 
-    public void writeMinHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeMinHeatSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readMaxConstTempAttribute(
+        MaxConstTempAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_CONST_TEMP_ATTRIBUTE_ID);
+
+      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);
     }
 
-    public void subscribeMinHeatSetpointLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeMaxConstTempAttribute(
+        MaxConstTempAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_CONST_TEMP_ATTRIBUTE_ID);
+
+      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);
     }
 
-    public void readMaxHeatSetpointLimitAttribute(
+    public void readPumpStatusAttribute(
         IntegerAttributeCallback callback) {
-        readMaxHeatSetpointLimitAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PUMP_STATUS_ATTRIBUTE_ID);
+
+      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);
     }
 
-    public void writeMaxHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
-        writeMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, value, null);
+    public void subscribePumpStatusAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PUMP_STATUS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PUMP_STATUS_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeMaxHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readEffectiveOperationModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EFFECTIVE_OPERATION_MODE_ATTRIBUTE_ID);
+
+      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);
     }
 
-    public void subscribeMaxHeatSetpointLimitAttribute(
+    public void subscribeEffectiveOperationModeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EFFECTIVE_OPERATION_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EFFECTIVE_OPERATION_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMinCoolSetpointLimitAttribute(
+    public void readEffectiveControlModeAttribute(
         IntegerAttributeCallback callback) {
-        readMinCoolSetpointLimitAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EFFECTIVE_CONTROL_MODE_ATTRIBUTE_ID);
+
+      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);
     }
 
-    public void writeMinCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
-        writeMinCoolSetpointLimitAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeEffectiveControlModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EFFECTIVE_CONTROL_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, EFFECTIVE_CONTROL_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void writeMinCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeMinCoolSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readCapacityAttribute(
+        CapacityAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CAPACITY_ATTRIBUTE_ID);
+
+      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);
     }
 
-    public void subscribeMinCoolSetpointLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCapacityAttribute(
+        CapacityAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CAPACITY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CAPACITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void readMaxCoolSetpointLimitAttribute(
-        IntegerAttributeCallback callback) {
-        readMaxCoolSetpointLimitAttribute(chipClusterPtr, callback);
+    public void readSpeedAttribute(
+        SpeedAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPEED_ATTRIBUTE_ID);
+
+      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);
     }
 
-    public void writeMaxCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
-        writeMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeSpeedAttribute(
+        SpeedAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPEED_ATTRIBUTE_ID);
+
+      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 writeMaxCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readLifetimeRunningHoursAttribute(
+        LifetimeRunningHoursAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIFETIME_RUNNING_HOURS_ATTRIBUTE_ID);
+
+      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 subscribeMaxCoolSetpointLimitAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeLifetimeRunningHoursAttribute(DefaultClusterCallback callback, Long value) {
+      writeLifetimeRunningHoursAttribute(callback, value, 0);
     }
 
-    public void readMinSetpointDeadBandAttribute(
-        IntegerAttributeCallback callback) {
-        readMinSetpointDeadBandAttribute(chipClusterPtr, callback);
+    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 writeMinSetpointDeadBandAttribute(DefaultClusterCallback callback, Integer value) {
-        writeMinSetpointDeadBandAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeLifetimeRunningHoursAttribute(
+        LifetimeRunningHoursAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIFETIME_RUNNING_HOURS_ATTRIBUTE_ID);
+
+      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 writeMinSetpointDeadBandAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeMinSetpointDeadBandAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readPowerAttribute(
+        PowerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_ATTRIBUTE_ID);
+
+      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 subscribeMinSetpointDeadBandAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinSetpointDeadBandAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribePowerAttribute(
+        PowerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, POWER_ATTRIBUTE_ID);
+
+      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 readRemoteSensingAttribute(
-        IntegerAttributeCallback callback) {
-        readRemoteSensingAttribute(chipClusterPtr, callback);
+    public void readLifetimeEnergyConsumedAttribute(
+        LifetimeEnergyConsumedAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIFETIME_ENERGY_CONSUMED_ATTRIBUTE_ID);
+
+      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 writeRemoteSensingAttribute(DefaultClusterCallback callback, Integer value) {
-        writeRemoteSensingAttribute(chipClusterPtr, callback, value, null);
+    public void writeLifetimeEnergyConsumedAttribute(DefaultClusterCallback callback, Long value) {
+      writeLifetimeEnergyConsumedAttribute(callback, value, 0);
     }
 
-    public void writeRemoteSensingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeRemoteSensingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    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 subscribeRemoteSensingAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRemoteSensingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeLifetimeEnergyConsumedAttribute(
+        LifetimeEnergyConsumedAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIFETIME_ENERGY_CONSUMED_ATTRIBUTE_ID);
+
+      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 readControlSequenceOfOperationAttribute(
+    public void readOperationModeAttribute(
         IntegerAttributeCallback callback) {
-        readControlSequenceOfOperationAttribute(chipClusterPtr, 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 writeControlSequenceOfOperationAttribute(DefaultClusterCallback callback, Integer value) {
-        writeControlSequenceOfOperationAttribute(chipClusterPtr, callback, value, null);
+    public void writeOperationModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOperationModeAttribute(callback, value, 0);
     }
 
-    public void writeControlSequenceOfOperationAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeControlSequenceOfOperationAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    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 subscribeControlSequenceOfOperationAttribute(
+    public void subscribeOperationModeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeControlSequenceOfOperationAttribute(chipClusterPtr, callback, minInterval, 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 readSystemModeAttribute(
+    public void readControlModeAttribute(
         IntegerAttributeCallback callback) {
-        readSystemModeAttribute(chipClusterPtr, 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 writeSystemModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeSystemModeAttribute(chipClusterPtr, callback, value, null);
+    public void writeControlModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeControlModeAttribute(callback, value, 0);
     }
 
-    public void writeSystemModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeSystemModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    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 subscribeSystemModeAttribute(
+    public void subscribeControlModeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSystemModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONTROL_MODE_ATTRIBUTE_ID);
 
-    public void readThermostatRunningModeAttribute(
-        IntegerAttributeCallback callback) {
-        readThermostatRunningModeAttribute(chipClusterPtr, callback);
+      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 subscribeThermostatRunningModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeThermostatRunningModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    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 readStartOfWeekAttribute(
-        IntegerAttributeCallback callback) {
-        readStartOfWeekAttribute(chipClusterPtr, callback);
+    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 subscribeStartOfWeekAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStartOfWeekAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    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 readNumberOfWeeklyTransitionsAttribute(
-        IntegerAttributeCallback callback) {
-        readNumberOfWeeklyTransitionsAttribute(chipClusterPtr, callback);
+    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 subscribeNumberOfWeeklyTransitionsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfWeeklyTransitionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    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 readNumberOfDailyTransitionsAttribute(
-        IntegerAttributeCallback callback) {
-        readNumberOfDailyTransitionsAttribute(chipClusterPtr, callback);
+    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 subscribeNumberOfDailyTransitionsAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfDailyTransitionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    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 readTemperatureSetpointHoldAttribute(
-        IntegerAttributeCallback callback) {
-        readTemperatureSetpointHoldAttribute(chipClusterPtr, callback);
+    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 writeTemperatureSetpointHoldAttribute(DefaultClusterCallback callback, Integer value) {
-        writeTemperatureSetpointHoldAttribute(chipClusterPtr, callback, value, null);
+    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 writeTemperatureSetpointHoldAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeTemperatureSetpointHoldAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    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 subscribeTemperatureSetpointHoldAttribute(
+    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 subscribeClusterRevisionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTemperatureSetpointHoldAttribute(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 readTemperatureSetpointHoldDurationAttribute(
-        TemperatureSetpointHoldDurationAttributeCallback callback) {
-        readTemperatureSetpointHoldDurationAttribute(chipClusterPtr, callback);
+  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);
     }
 
-    public void writeTemperatureSetpointHoldDurationAttribute(DefaultClusterCallback callback, Integer value) {
-        writeTemperatureSetpointHoldDurationAttribute(chipClusterPtr, callback, value, null);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
     }
 
-    public void writeTemperatureSetpointHoldDurationAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeTemperatureSetpointHoldDurationAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void setpointRaiseLower(DefaultClusterCallback callback, Integer mode, Integer amount) {
+      setpointRaiseLower(callback, mode, amount, 0);
     }
 
-    public void subscribeTemperatureSetpointHoldDurationAttribute(
-        TemperatureSetpointHoldDurationAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTemperatureSetpointHoldDurationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void setpointRaiseLower(DefaultClusterCallback callback, Integer mode, Integer amount, int timedInvokeTimeoutMs) {
+      final long commandId = 0L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long modeFieldID = 0L;
+      BaseTLVType modetlvValue = new UIntType(mode);
+      elements.add(new StructElement(modeFieldID, modetlvValue));
+
+      final long amountFieldID = 1L;
+      BaseTLVType amounttlvValue = new IntType(amount);
+      elements.add(new StructElement(amountFieldID, amounttlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void readThermostatProgrammingOperationModeAttribute(
-        IntegerAttributeCallback callback) {
-        readThermostatProgrammingOperationModeAttribute(chipClusterPtr, callback);
+    public void setWeeklySchedule(DefaultClusterCallback callback, Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions) {
+      setWeeklySchedule(callback, numberOfTransitionsForSequence, dayOfWeekForSequence, modeForSequence, transitions, 0);
     }
 
-    public void writeThermostatProgrammingOperationModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeThermostatProgrammingOperationModeAttribute(chipClusterPtr, callback, value, null);
+    public void setWeeklySchedule(DefaultClusterCallback callback, Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions, int timedInvokeTimeoutMs) {
+      final long commandId = 1L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long numberOfTransitionsForSequenceFieldID = 0L;
+      BaseTLVType numberOfTransitionsForSequencetlvValue = new UIntType(numberOfTransitionsForSequence);
+      elements.add(new StructElement(numberOfTransitionsForSequenceFieldID, numberOfTransitionsForSequencetlvValue));
+
+      final long dayOfWeekForSequenceFieldID = 1L;
+      BaseTLVType dayOfWeekForSequencetlvValue = new UIntType(dayOfWeekForSequence);
+      elements.add(new StructElement(dayOfWeekForSequenceFieldID, dayOfWeekForSequencetlvValue));
+
+      final long modeForSequenceFieldID = 2L;
+      BaseTLVType modeForSequencetlvValue = new UIntType(modeForSequence);
+      elements.add(new StructElement(modeForSequenceFieldID, modeForSequencetlvValue));
+
+      final long transitionsFieldID = 3L;
+      BaseTLVType transitionstlvValue = ArrayType.generateArrayType(transitions, (elementtransitions) -> elementtransitions.encodeTlv());
+      elements.add(new StructElement(transitionsFieldID, transitionstlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    public void writeThermostatProgrammingOperationModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeThermostatProgrammingOperationModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void getWeeklySchedule(GetWeeklyScheduleResponseCallback callback, Integer daysToReturn, Integer modeToReturn) {
+      getWeeklySchedule(callback, daysToReturn, modeToReturn, 0);
     }
 
-    public void subscribeThermostatProgrammingOperationModeAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeThermostatProgrammingOperationModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    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);
     }
 
-    public void readThermostatRunningStateAttribute(
-        IntegerAttributeCallback callback) {
-        readThermostatRunningStateAttribute(chipClusterPtr, callback);
+    public void clearWeeklySchedule(DefaultClusterCallback callback) {
+      clearWeeklySchedule(callback, 0);
     }
 
-    public void subscribeThermostatRunningStateAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeThermostatRunningStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void clearWeeklySchedule(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 readSetpointChangeSourceAttribute(
-        IntegerAttributeCallback callback) {
-        readSetpointChangeSourceAttribute(chipClusterPtr, callback);
+    public interface GetWeeklyScheduleResponseCallback extends BaseClusterCallback {
+      void onSuccess(Integer numberOfTransitionsForSequence, Integer dayOfWeekForSequence, Integer modeForSequence, ArrayList<ChipStructs.ThermostatClusterThermostatScheduleTransition> transitions);
     }
 
-    public void subscribeSetpointChangeSourceAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSetpointChangeSourceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface LocalTemperatureAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void readSetpointChangeAmountAttribute(
-        SetpointChangeAmountAttributeCallback callback) {
-        readSetpointChangeAmountAttribute(chipClusterPtr, callback);
+    public interface OutdoorTemperatureAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void subscribeSetpointChangeAmountAttribute(
-        SetpointChangeAmountAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSetpointChangeAmountAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface TemperatureSetpointHoldDurationAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void readSetpointChangeSourceTimestampAttribute(
-        LongAttributeCallback callback) {
-        readSetpointChangeSourceTimestampAttribute(chipClusterPtr, callback);
+    public interface SetpointChangeAmountAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void subscribeSetpointChangeSourceTimestampAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSetpointChangeSourceTimestampAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface OccupiedSetbackAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void readOccupiedSetbackAttribute(
-        OccupiedSetbackAttributeCallback callback) {
-        readOccupiedSetbackAttribute(chipClusterPtr, callback);
+    public interface OccupiedSetbackMinAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void writeOccupiedSetbackAttribute(DefaultClusterCallback callback, Integer value) {
-        writeOccupiedSetbackAttribute(chipClusterPtr, callback, value, null);
+    public interface OccupiedSetbackMaxAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void writeOccupiedSetbackAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeOccupiedSetbackAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public interface UnoccupiedSetbackAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void subscribeOccupiedSetbackAttribute(
-        OccupiedSetbackAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOccupiedSetbackAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface UnoccupiedSetbackMinAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void readOccupiedSetbackMinAttribute(
-        OccupiedSetbackMinAttributeCallback callback) {
-        readOccupiedSetbackMinAttribute(chipClusterPtr, callback);
+    public interface UnoccupiedSetbackMaxAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void subscribeOccupiedSetbackMinAttribute(
-        OccupiedSetbackMinAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOccupiedSetbackMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface ACCoilTemperatureAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
     }
 
-    public void readOccupiedSetbackMaxAttribute(
-        OccupiedSetbackMaxAttributeCallback callback) {
-        readOccupiedSetbackMaxAttribute(chipClusterPtr, callback);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void subscribeOccupiedSetbackMaxAttribute(
-        OccupiedSetbackMaxAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOccupiedSetbackMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void readUnoccupiedSetbackAttribute(
-        UnoccupiedSetbackAttributeCallback callback) {
-        readUnoccupiedSetbackAttribute(chipClusterPtr, callback);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void writeUnoccupiedSetbackAttribute(DefaultClusterCallback callback, Integer value) {
-        writeUnoccupiedSetbackAttribute(chipClusterPtr, callback, value, null);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
     }
 
-    public void writeUnoccupiedSetbackAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeUnoccupiedSetbackAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    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 subscribeUnoccupiedSetbackAttribute(
-        UnoccupiedSetbackAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUnoccupiedSetbackAttribute(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 readUnoccupiedSetbackMinAttribute(
-        UnoccupiedSetbackMinAttributeCallback callback) {
-        readUnoccupiedSetbackMinAttribute(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 subscribeUnoccupiedSetbackMinAttribute(
-        UnoccupiedSetbackMinAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUnoccupiedSetbackMinAttribute(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 readUnoccupiedSetbackMaxAttribute(
-        UnoccupiedSetbackMaxAttributeCallback callback) {
-        readUnoccupiedSetbackMaxAttribute(chipClusterPtr, callback);
+    public void readOccupancyAttribute(
+        IntegerAttributeCallback 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 subscribeUnoccupiedSetbackMaxAttribute(
-        UnoccupiedSetbackMaxAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUnoccupiedSetbackMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeOccupancyAttribute(
+        IntegerAttributeCallback callback, int minInterval, int 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 readEmergencyHeatDeltaAttribute(
+    public void readAbsMinHeatSetpointLimitAttribute(
         IntegerAttributeCallback callback) {
-        readEmergencyHeatDeltaAttribute(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 writeEmergencyHeatDeltaAttribute(DefaultClusterCallback callback, Integer value) {
-        writeEmergencyHeatDeltaAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeAbsMinHeatSetpointLimitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int 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 writeEmergencyHeatDeltaAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeEmergencyHeatDeltaAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readAbsMaxHeatSetpointLimitAttribute(
+        IntegerAttributeCallback 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 subscribeEmergencyHeatDeltaAttribute(
+    public void subscribeAbsMaxHeatSetpointLimitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEmergencyHeatDeltaAttribute(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 readACTypeAttribute(
+    public void readAbsMinCoolSetpointLimitAttribute(
         IntegerAttributeCallback callback) {
-        readACTypeAttribute(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 writeACTypeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeACTypeAttribute(chipClusterPtr, callback, value, null);
+    public void subscribeAbsMinCoolSetpointLimitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int 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 writeACTypeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeACTypeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    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 subscribeACTypeAttribute(
+    public void subscribeAbsMaxCoolSetpointLimitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeACTypeAttribute(chipClusterPtr, callback, minInterval, 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 readACCapacityAttribute(
+    public void readPICoolingDemandAttribute(
         IntegerAttributeCallback callback) {
-        readACCapacityAttribute(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 writeACCapacityAttribute(DefaultClusterCallback callback, Integer value) {
-        writeACCapacityAttribute(chipClusterPtr, callback, value, null);
+    public void subscribePICoolingDemandAttribute(
+        IntegerAttributeCallback callback, int minInterval, int 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 writeACCapacityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeACCapacityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    public void readPIHeatingDemandAttribute(
+        IntegerAttributeCallback 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 subscribeACCapacityAttribute(
+    public void subscribePIHeatingDemandAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeACCapacityAttribute(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 readACRefrigerantTypeAttribute(
+    public void readHVACSystemTypeConfigurationAttribute(
         IntegerAttributeCallback callback) {
-        readACRefrigerantTypeAttribute(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 writeACRefrigerantTypeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeACRefrigerantTypeAttribute(chipClusterPtr, callback, value, null);
+    public void writeHVACSystemTypeConfigurationAttribute(DefaultClusterCallback callback, Integer value) {
+      writeHVACSystemTypeConfigurationAttribute(callback, value, 0);
     }
 
-    public void writeACRefrigerantTypeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeACRefrigerantTypeAttribute(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 subscribeACRefrigerantTypeAttribute(
+    public void subscribeHVACSystemTypeConfigurationAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeACRefrigerantTypeAttribute(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 readACCompressorTypeAttribute(
+    public void readLocalTemperatureCalibrationAttribute(
         IntegerAttributeCallback callback) {
-        readACCompressorTypeAttribute(chipClusterPtr, 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 writeACCompressorTypeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeACCompressorTypeAttribute(chipClusterPtr, callback, value, null);
+    public void writeLocalTemperatureCalibrationAttribute(DefaultClusterCallback callback, Integer value) {
+      writeLocalTemperatureCalibrationAttribute(callback, value, 0);
     }
 
-    public void writeACCompressorTypeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeACCompressorTypeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    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 subscribeACCompressorTypeAttribute(
+    public void subscribeLocalTemperatureCalibrationAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeACCompressorTypeAttribute(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 readACErrorCodeAttribute(
-        LongAttributeCallback callback) {
-        readACErrorCodeAttribute(chipClusterPtr, callback);
+    public void readOccupiedCoolingSetpointAttribute(
+        IntegerAttributeCallback 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 writeACErrorCodeAttribute(DefaultClusterCallback callback, Long value) {
-        writeACErrorCodeAttribute(chipClusterPtr, callback, value, null);
+    public void writeOccupiedCoolingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOccupiedCoolingSetpointAttribute(callback, value, 0);
     }
 
-    public void writeACErrorCodeAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeACErrorCodeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    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 subscribeACErrorCodeAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeACErrorCodeAttribute(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 readACLouverPositionAttribute(
+    public void readOccupiedHeatingSetpointAttribute(
         IntegerAttributeCallback callback) {
-        readACLouverPositionAttribute(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 writeACLouverPositionAttribute(DefaultClusterCallback callback, Integer value) {
-        writeACLouverPositionAttribute(chipClusterPtr, callback, value, null);
+    public void writeOccupiedHeatingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOccupiedHeatingSetpointAttribute(callback, value, 0);
     }
 
-    public void writeACLouverPositionAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeACLouverPositionAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    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 subscribeACLouverPositionAttribute(
+    public void subscribeOccupiedHeatingSetpointAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeACLouverPositionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID);
 
-    public void readACCoilTemperatureAttribute(
-        ACCoilTemperatureAttributeCallback callback) {
-        readACCoilTemperatureAttribute(chipClusterPtr, callback);
+      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 subscribeACCoilTemperatureAttribute(
-        ACCoilTemperatureAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeACCoilTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
-
-    public void readACCapacityformatAttribute(
+    public void readUnoccupiedCoolingSetpointAttribute(
         IntegerAttributeCallback callback) {
-        readACCapacityformatAttribute(chipClusterPtr, 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 writeACCapacityformatAttribute(DefaultClusterCallback callback, Integer value) {
-        writeACCapacityformatAttribute(chipClusterPtr, callback, value, null);
+    public void writeUnoccupiedCoolingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
+      writeUnoccupiedCoolingSetpointAttribute(callback, value, 0);
     }
 
-    public void writeACCapacityformatAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeACCapacityformatAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+    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 subscribeACCapacityformatAttribute(
+    public void subscribeUnoccupiedCoolingSetpointAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeACCapacityformatAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNOCCUPIED_COOLING_SETPOINT_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);
+          }
+        }, UNOCCUPIED_COOLING_SETPOINT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
-    public void subscribeGeneratedCommandListAttribute(
-        GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeGeneratedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readUnoccupiedHeatingSetpointAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNOCCUPIED_HEATING_SETPOINT_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);
+          }
+        }, UNOCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID, true);
     }
 
-    public void subscribeAcceptedCommandListAttribute(
-        AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptedCommandListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeUnoccupiedHeatingSetpointAttribute(DefaultClusterCallback callback, Integer value) {
+      writeUnoccupiedHeatingSetpointAttribute(callback, value, 0);
     }
 
-    public void readEventListAttribute(
-        EventListAttributeCallback callback) {
-        readEventListAttribute(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 subscribeEventListAttribute(
-        EventListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEventListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void subscribeUnoccupiedHeatingSetpointAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNOCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID);
 
-    public void readAttributeListAttribute(
-        AttributeListAttributeCallback callback) {
-        readAttributeListAttribute(chipClusterPtr, callback);
+      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 subscribeAttributeListAttribute(
-        AttributeListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAttributeListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
-    }
+    public void readMinHeatSetpointLimitAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID);
 
-    public void readFeatureMapAttribute(
-        LongAttributeCallback callback) {
-        readFeatureMapAttribute(chipClusterPtr, callback);
+      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 subscribeFeatureMapAttribute(
-        LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFeatureMapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void writeMinHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMinHeatSetpointLimitAttribute(callback, value, 0);
     }
 
-    public void readClusterRevisionAttribute(
-        IntegerAttributeCallback callback) {
-        readClusterRevisionAttribute(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 subscribeClusterRevisionAttribute(
+    public void subscribeMinHeatSetpointLimitAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID);
+
+      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);
     }
 
-    private native void readLocalTemperatureAttribute(long chipClusterPtr, LocalTemperatureAttributeCallback callback);
+    public void readMaxHeatSetpointLimitAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_HEAT_SETPOINT_LIMIT_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);
+          }
+        }, MAX_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID, true);
+    }
 
-    private native void readOutdoorTemperatureAttribute(long chipClusterPtr, OutdoorTemperatureAttributeCallback callback);
+    public void writeMaxHeatSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMaxHeatSetpointLimitAttribute(callback, value, 0);
+    }
 
-    private native void subscribeOutdoorTemperatureAttribute(long chipClusterPtr, OutdoorTemperatureAttributeCallback callback, int minInterval, int 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);
+    }
 
-    private native void readOccupancyAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeMaxHeatSetpointLimitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID);
 
-    private native void subscribeOccupancyAttribute(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);
+          }
+        }, MAX_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAbsMinHeatSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readMinCoolSetpointLimitAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID);
 
-    private native void subscribeAbsMinHeatSetpointLimitAttribute(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_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID, true);
+    }
 
-    private native void readAbsMaxHeatSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeMinCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMinCoolSetpointLimitAttribute(callback, value, 0);
+    }
 
-    private native void subscribeAbsMaxHeatSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int 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);
+    }
 
-    private native void readAbsMinCoolSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeMinCoolSetpointLimitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_COOL_SETPOINT_LIMIT_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) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, MIN_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readAbsMaxCoolSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readMaxCoolSetpointLimitAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_COOL_SETPOINT_LIMIT_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) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+            callback.onSuccess(value);
+          }
+        }, MAX_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID, true);
+    }
 
-    private native void readPICoolingDemandAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeMaxCoolSetpointLimitAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMaxCoolSetpointLimitAttribute(callback, value, 0);
+    }
 
-    private native void subscribePICoolingDemandAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    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);
+    }
 
-    private native void readPIHeatingDemandAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeMaxCoolSetpointLimitAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID);
 
-    private native void subscribePIHeatingDemandAttribute(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);
+          }
+        }, MAX_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readHVACSystemTypeConfigurationAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readMinSetpointDeadBandAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_SETPOINT_DEAD_BAND_ATTRIBUTE_ID);
 
-    private native void writeHVACSystemTypeConfigurationAttribute(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);
+          }
+        }, MIN_SETPOINT_DEAD_BAND_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeHVACSystemTypeConfigurationAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeMinSetpointDeadBandAttribute(DefaultClusterCallback callback, Integer value) {
+      writeMinSetpointDeadBandAttribute(callback, value, 0);
+    }
 
-    private native void readLocalTemperatureCalibrationAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    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);
+    }
 
-    private native void writeLocalTemperatureCalibrationAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeMinSetpointDeadBandAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_SETPOINT_DEAD_BAND_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);
+          }
+        }, MIN_SETPOINT_DEAD_BAND_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readOccupiedCoolingSetpointAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readRemoteSensingAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REMOTE_SENSING_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);
+          }
+        }, REMOTE_SENSING_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeOccupiedCoolingSetpointAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeRemoteSensingAttribute(DefaultClusterCallback callback, Integer value) {
+      writeRemoteSensingAttribute(callback, value, 0);
+    }
 
-    private native void readOccupiedHeatingSetpointAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeRemoteSensingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), REMOTE_SENSING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void writeOccupiedHeatingSetpointAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeRemoteSensingAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, REMOTE_SENSING_ATTRIBUTE_ID);
 
-    private native void subscribeOccupiedHeatingSetpointAttribute(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);
+          }
+        }, REMOTE_SENSING_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readUnoccupiedCoolingSetpointAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readControlSequenceOfOperationAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONTROL_SEQUENCE_OF_OPERATION_ATTRIBUTE_ID);
 
-    private native void writeUnoccupiedCoolingSetpointAttribute(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);
+          }
+        }, CONTROL_SEQUENCE_OF_OPERATION_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeUnoccupiedCoolingSetpointAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeControlSequenceOfOperationAttribute(DefaultClusterCallback callback, Integer value) {
+      writeControlSequenceOfOperationAttribute(callback, value, 0);
+    }
 
-    private native void readUnoccupiedHeatingSetpointAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    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);
+    }
 
-    private native void writeUnoccupiedHeatingSetpointAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeControlSequenceOfOperationAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CONTROL_SEQUENCE_OF_OPERATION_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) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, CONTROL_SEQUENCE_OF_OPERATION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMinHeatSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readSystemModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SYSTEM_MODE_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);
+          }
+        }, SYSTEM_MODE_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeMinHeatSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeSystemModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeSystemModeAttribute(callback, value, 0);
+    }
 
-    private native void readMaxHeatSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback 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);
+    }
 
-    private native void writeMaxHeatSetpointLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeSystemModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SYSTEM_MODE_ATTRIBUTE_ID);
 
-    private native void subscribeMaxHeatSetpointLimitAttribute(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);
+          }
+        }, SYSTEM_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readMinCoolSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readThermostatRunningModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, THERMOSTAT_RUNNING_MODE_ATTRIBUTE_ID);
 
-    private native void writeMinCoolSetpointLimitAttribute(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);
+          }
+        }, THERMOSTAT_RUNNING_MODE_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeMinCoolSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeThermostatRunningModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, THERMOSTAT_RUNNING_MODE_ATTRIBUTE_ID);
 
-    private native void readMaxCoolSetpointLimitAttribute(long chipClusterPtr, IntegerAttributeCallback 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);
+    }
 
-    private native void writeMaxCoolSetpointLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readStartOfWeekAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_OF_WEEK_ATTRIBUTE_ID);
 
-    private native void subscribeMaxCoolSetpointLimitAttribute(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);
+          }
+        }, START_OF_WEEK_ATTRIBUTE_ID, true);
+    }
 
-    private native void readMinSetpointDeadBandAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeStartOfWeekAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_OF_WEEK_ATTRIBUTE_ID);
 
-    private native void writeMinSetpointDeadBandAttribute(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);
+          }
+        }, START_OF_WEEK_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeMinSetpointDeadBandAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readNumberOfWeeklyTransitionsAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_WEEKLY_TRANSITIONS_ATTRIBUTE_ID);
 
-    private native void readRemoteSensingAttribute(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_WEEKLY_TRANSITIONS_ATTRIBUTE_ID, true);
+    }
 
-    private native void writeRemoteSensingAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeNumberOfWeeklyTransitionsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_WEEKLY_TRANSITIONS_ATTRIBUTE_ID);
 
-    private native void subscribeRemoteSensingAttribute(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_WEEKLY_TRANSITIONS_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readControlSequenceOfOperationAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readNumberOfDailyTransitionsAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_DAILY_TRANSITIONS_ATTRIBUTE_ID);
 
-    private native void writeControlSequenceOfOperationAttribute(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);
+          }
+        }, NUMBER_OF_DAILY_TRANSITIONS_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeControlSequenceOfOperationAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeNumberOfDailyTransitionsAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_DAILY_TRANSITIONS_ATTRIBUTE_ID);
 
-    private native void readSystemModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      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);
+    }
 
-    private native void writeSystemModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readTemperatureSetpointHoldAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEMPERATURE_SETPOINT_HOLD_ATTRIBUTE_ID);
 
-    private native void subscribeSystemModeAttribute(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);
+          }
+        }, TEMPERATURE_SETPOINT_HOLD_ATTRIBUTE_ID, true);
+    }
 
-    private native void readThermostatRunningModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeTemperatureSetpointHoldAttribute(DefaultClusterCallback callback, Integer value) {
+      writeTemperatureSetpointHoldAttribute(callback, value, 0);
+    }
 
-    private native void subscribeThermostatRunningModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    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);
+    }
 
-    private native void readStartOfWeekAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeTemperatureSetpointHoldAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEMPERATURE_SETPOINT_HOLD_ATTRIBUTE_ID);
 
-    private native void subscribeStartOfWeekAttribute(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);
+          }
+        }, TEMPERATURE_SETPOINT_HOLD_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readNumberOfWeeklyTransitionsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readTemperatureSetpointHoldDurationAttribute(
+        TemperatureSetpointHoldDurationAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEMPERATURE_SETPOINT_HOLD_DURATION_ATTRIBUTE_ID);
 
-    private native void subscribeNumberOfWeeklyTransitionsAttribute(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);
+          }
+        }, TEMPERATURE_SETPOINT_HOLD_DURATION_ATTRIBUTE_ID, true);
+    }
 
-    private native void readNumberOfDailyTransitionsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeTemperatureSetpointHoldDurationAttribute(DefaultClusterCallback callback, Integer value) {
+      writeTemperatureSetpointHoldDurationAttribute(callback, value, 0);
+    }
 
-    private native void subscribeNumberOfDailyTransitionsAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    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);
+    }
 
-    private native void readTemperatureSetpointHoldAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeTemperatureSetpointHoldDurationAttribute(
+        TemperatureSetpointHoldDurationAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEMPERATURE_SETPOINT_HOLD_DURATION_ATTRIBUTE_ID);
 
-    private native void writeTemperatureSetpointHoldAttribute(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);
+          }
+        }, TEMPERATURE_SETPOINT_HOLD_DURATION_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeTemperatureSetpointHoldAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readThermostatProgrammingOperationModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, THERMOSTAT_PROGRAMMING_OPERATION_MODE_ATTRIBUTE_ID);
 
-    private native void readTemperatureSetpointHoldDurationAttribute(long chipClusterPtr, TemperatureSetpointHoldDurationAttributeCallback callback);
+      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);
+    }
 
-    private native void writeTemperatureSetpointHoldDurationAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void writeThermostatProgrammingOperationModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeThermostatProgrammingOperationModeAttribute(callback, value, 0);
+    }
 
-    private native void subscribeTemperatureSetpointHoldDurationAttribute(long chipClusterPtr, TemperatureSetpointHoldDurationAttributeCallback callback, int minInterval, int maxInterval);
+    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);
+    }
 
-    private native void readThermostatProgrammingOperationModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeThermostatProgrammingOperationModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, THERMOSTAT_PROGRAMMING_OPERATION_MODE_ATTRIBUTE_ID);
 
-    private native void writeThermostatProgrammingOperationModeAttribute(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);
+          }
+        }, THERMOSTAT_PROGRAMMING_OPERATION_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeThermostatProgrammingOperationModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readThermostatRunningStateAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, THERMOSTAT_RUNNING_STATE_ATTRIBUTE_ID);
 
-    private native void readThermostatRunningStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      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);
+    }
 
-    private native void subscribeThermostatRunningStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeThermostatRunningStateAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, THERMOSTAT_RUNNING_STATE_ATTRIBUTE_ID);
 
-    private native void readSetpointChangeSourceAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, THERMOSTAT_RUNNING_STATE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeSetpointChangeSourceAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readSetpointChangeSourceAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SETPOINT_CHANGE_SOURCE_ATTRIBUTE_ID);
 
-    private native void readSetpointChangeAmountAttribute(long chipClusterPtr, SetpointChangeAmountAttributeCallback callback);
+      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);
+    }
 
-    private native void subscribeSetpointChangeAmountAttribute(long chipClusterPtr, SetpointChangeAmountAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeSetpointChangeSourceAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SETPOINT_CHANGE_SOURCE_ATTRIBUTE_ID);
 
-    private native void readSetpointChangeSourceTimestampAttribute(long chipClusterPtr, LongAttributeCallback 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);
+    }
 
-    private native void subscribeSetpointChangeSourceTimestampAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void readSetpointChangeAmountAttribute(
+        SetpointChangeAmountAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SETPOINT_CHANGE_AMOUNT_ATTRIBUTE_ID);
 
-    private native void readOccupiedSetbackAttribute(long chipClusterPtr, OccupiedSetbackAttributeCallback 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);
+    }
 
-    private native void writeOccupiedSetbackAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeSetpointChangeAmountAttribute(
+        SetpointChangeAmountAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SETPOINT_CHANGE_AMOUNT_ATTRIBUTE_ID);
 
-    private native void subscribeOccupiedSetbackAttribute(long chipClusterPtr, OccupiedSetbackAttributeCallback callback, int minInterval, int maxInterval);
+      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);
+    }
 
-    private native void readOccupiedSetbackMinAttribute(long chipClusterPtr, OccupiedSetbackMinAttributeCallback callback);
+    public void readSetpointChangeSourceTimestampAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SETPOINT_CHANGE_SOURCE_TIMESTAMP_ATTRIBUTE_ID);
 
-    private native void subscribeOccupiedSetbackMinAttribute(long chipClusterPtr, OccupiedSetbackMinAttributeCallback 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);
+          }
+        }, SETPOINT_CHANGE_SOURCE_TIMESTAMP_ATTRIBUTE_ID, true);
+    }
 
-    private native void readOccupiedSetbackMaxAttribute(long chipClusterPtr, OccupiedSetbackMaxAttributeCallback callback);
+    public void subscribeSetpointChangeSourceTimestampAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SETPOINT_CHANGE_SOURCE_TIMESTAMP_ATTRIBUTE_ID);
 
-    private native void subscribeOccupiedSetbackMaxAttribute(long chipClusterPtr, OccupiedSetbackMaxAttributeCallback callback, int minInterval, int maxInterval);
+      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);
+    }
 
-    private native void readUnoccupiedSetbackAttribute(long chipClusterPtr, UnoccupiedSetbackAttributeCallback callback);
+    public void readOccupiedSetbackAttribute(
+        OccupiedSetbackAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPIED_SETBACK_ATTRIBUTE_ID);
 
-    private native void writeUnoccupiedSetbackAttribute(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);
+          }
+        }, OCCUPIED_SETBACK_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeUnoccupiedSetbackAttribute(long chipClusterPtr, UnoccupiedSetbackAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeOccupiedSetbackAttribute(DefaultClusterCallback callback, Integer value) {
+      writeOccupiedSetbackAttribute(callback, value, 0);
+    }
 
-    private native void readUnoccupiedSetbackMinAttribute(long chipClusterPtr, UnoccupiedSetbackMinAttributeCallback 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);
+    }
 
-    private native void subscribeUnoccupiedSetbackMinAttribute(long chipClusterPtr, UnoccupiedSetbackMinAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeOccupiedSetbackAttribute(
+        OccupiedSetbackAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPIED_SETBACK_ATTRIBUTE_ID);
 
-    private native void readUnoccupiedSetbackMaxAttribute(long chipClusterPtr, UnoccupiedSetbackMaxAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OCCUPIED_SETBACK_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeUnoccupiedSetbackMaxAttribute(long chipClusterPtr, UnoccupiedSetbackMaxAttributeCallback callback, int minInterval, int maxInterval);
+    public void readOccupiedSetbackMinAttribute(
+        OccupiedSetbackMinAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPIED_SETBACK_MIN_ATTRIBUTE_ID);
 
-    private native void readEmergencyHeatDeltaAttribute(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);
+          }
+        }, OCCUPIED_SETBACK_MIN_ATTRIBUTE_ID, true);
+    }
 
-    private native void writeEmergencyHeatDeltaAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeOccupiedSetbackMinAttribute(
+        OccupiedSetbackMinAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPIED_SETBACK_MIN_ATTRIBUTE_ID);
 
-    private native void subscribeEmergencyHeatDeltaAttribute(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);
+          }
+        }, OCCUPIED_SETBACK_MIN_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readACTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readOccupiedSetbackMaxAttribute(
+        OccupiedSetbackMaxAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPIED_SETBACK_MAX_ATTRIBUTE_ID);
 
-    private native void writeACTypeAttribute(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);
+          }
+        }, OCCUPIED_SETBACK_MAX_ATTRIBUTE_ID, true);
+    }
 
-    private native void subscribeACTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeOccupiedSetbackMaxAttribute(
+        OccupiedSetbackMaxAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPIED_SETBACK_MAX_ATTRIBUTE_ID);
 
-    private native void readACCapacityAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      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);
+    }
 
-    private native void writeACCapacityAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readUnoccupiedSetbackAttribute(
+        UnoccupiedSetbackAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNOCCUPIED_SETBACK_ATTRIBUTE_ID);
 
-    private native void subscribeACCapacityAttribute(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);
+          }
+        }, UNOCCUPIED_SETBACK_ATTRIBUTE_ID, true);
+    }
 
-    private native void readACRefrigerantTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeUnoccupiedSetbackAttribute(DefaultClusterCallback callback, Integer value) {
+      writeUnoccupiedSetbackAttribute(callback, value, 0);
+    }
 
-    private native void writeACRefrigerantTypeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    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);
+    }
 
-    private native void subscribeACRefrigerantTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeUnoccupiedSetbackAttribute(
+        UnoccupiedSetbackAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNOCCUPIED_SETBACK_ATTRIBUTE_ID);
 
-    private native void readACCompressorTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      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 writeACCompressorTypeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readUnoccupiedSetbackMinAttribute(
+        UnoccupiedSetbackMinAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNOCCUPIED_SETBACK_MIN_ATTRIBUTE_ID);
 
-    private native void subscribeACCompressorTypeAttribute(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);
+          }
+        }, UNOCCUPIED_SETBACK_MIN_ATTRIBUTE_ID, true);
+    }
 
-    private native void readACErrorCodeAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public void subscribeUnoccupiedSetbackMinAttribute(
+        UnoccupiedSetbackMinAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNOCCUPIED_SETBACK_MIN_ATTRIBUTE_ID);
 
-    private native void writeACErrorCodeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+      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 subscribeACErrorCodeAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void readUnoccupiedSetbackMaxAttribute(
+        UnoccupiedSetbackMaxAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNOCCUPIED_SETBACK_MAX_ATTRIBUTE_ID);
 
-    private native void readACLouverPositionAttribute(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 writeACLouverPositionAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void subscribeUnoccupiedSetbackMaxAttribute(
+        UnoccupiedSetbackMaxAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, UNOCCUPIED_SETBACK_MAX_ATTRIBUTE_ID);
 
-    private native void subscribeACLouverPositionAttribute(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);
+          }
+        }, UNOCCUPIED_SETBACK_MAX_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void readACCoilTemperatureAttribute(long chipClusterPtr, ACCoilTemperatureAttributeCallback callback);
+    public void readEmergencyHeatDeltaAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EMERGENCY_HEAT_DELTA_ATTRIBUTE_ID);
 
-    private native void subscribeACCoilTemperatureAttribute(long chipClusterPtr, ACCoilTemperatureAttributeCallback 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);
+          }
+        }, EMERGENCY_HEAT_DELTA_ATTRIBUTE_ID, true);
+    }
 
-    private native void readACCapacityformatAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeEmergencyHeatDeltaAttribute(DefaultClusterCallback callback, Integer value) {
+      writeEmergencyHeatDeltaAttribute(callback, value, 0);
+    }
 
-    private native void writeACCapacityformatAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    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 subscribeACCapacityformatAttribute(long chipClusterPtr, IntegerAttributeCallback 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 readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback 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 subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    public void readACTypeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_TYPE_ATTRIBUTE_ID);
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback 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);
+    }
+
+    public void writeACTypeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeACTypeAttribute(callback, value, 0);
+    }
+
+    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);
+    }
+
+    public void subscribeACTypeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_TYPE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, A_C_TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readACCapacityAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_CAPACITY_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void writeACCapacityAttribute(DefaultClusterCallback callback, Integer value) {
+      writeACCapacityAttribute(callback, value, 0);
+    }
+
+    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);
+    }
+
+    public void subscribeACCapacityAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_CAPACITY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, A_C_CAPACITY_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    public void readACRefrigerantTypeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_REFRIGERANT_TYPE_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void writeACRefrigerantTypeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeACRefrigerantTypeAttribute(callback, value, 0);
+    }
+
+    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);
+    }
+
+    public void subscribeACRefrigerantTypeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_REFRIGERANT_TYPE_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void readACCompressorTypeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_COMPRESSOR_TYPE_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void writeACCompressorTypeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeACCompressorTypeAttribute(callback, value, 0);
+    }
+
+    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);
+    }
+
+    public void subscribeACCompressorTypeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_COMPRESSOR_TYPE_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void readACErrorCodeAttribute(
+        LongAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_ERROR_CODE_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void writeACErrorCodeAttribute(DefaultClusterCallback callback, Long value) {
+      writeACErrorCodeAttribute(callback, value, 0);
+    }
+
+    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);
+    }
+
+    public void subscribeACErrorCodeAttribute(
+        LongAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_ERROR_CODE_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void readACLouverPositionAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_LOUVER_POSITION_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void writeACLouverPositionAttribute(DefaultClusterCallback callback, Integer value) {
+      writeACLouverPositionAttribute(callback, value, 0);
+    }
+
+    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);
+    }
+
+    public void subscribeACLouverPositionAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_LOUVER_POSITION_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void readACCoilTemperatureAttribute(
+        ACCoilTemperatureAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_COIL_TEMPERATURE_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void subscribeACCoilTemperatureAttribute(
+        ACCoilTemperatureAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_COIL_TEMPERATURE_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void readACCapacityformatAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_CAPACITYFORMAT_ATTRIBUTE_ID);
+
+      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);
+    }
+
+    public void writeACCapacityformatAttribute(DefaultClusterCallback callback, Integer value) {
+      writeACCapacityformatAttribute(callback, value, 0);
+    }
+
+    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);
+    }
+
+    public void subscribeACCapacityformatAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, A_C_CAPACITYFORMAT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, A_C_CAPACITYFORMAT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
+
+    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 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);
+    }
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+    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 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) {
+      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) {
+      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) {
+      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);
+    }
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+    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 subscribeEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback, int minInterval, int 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);
+    }
 
-    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;
 
+    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;
+
     public FanControlCluster(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 step(DefaultClusterCallback callback, Integer direction, Optional<Boolean> wrap, Optional<Boolean> lowestOff) {
-      step(chipClusterPtr, callback, direction, wrap, lowestOff, null);
+      step(callback, direction, wrap, lowestOff, 0);
     }
 
     public void step(DefaultClusterCallback callback, Integer direction, Optional<Boolean> wrap, Optional<Boolean> lowestOff, int timedInvokeTimeoutMs) {
-      step(chipClusterPtr, callback, direction, wrap, lowestOff, timedInvokeTimeoutMs);
-    }
+      final long commandId = 0L;
 
-    private native void step(long chipClusterPtr, DefaultClusterCallback callback, Integer direction, Optional<Boolean> wrap, Optional<Boolean> lowestOff, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long directionFieldID = 0L;
+      BaseTLVType directiontlvValue = new UIntType(direction);
+      elements.add(new StructElement(directionFieldID, directiontlvValue));
+
+      final long wrapFieldID = 1L;
+      BaseTLVType wraptlvValue = wrap.<BaseTLVType>map((nonOptionalwrap) -> new BooleanType(nonOptionalwrap)).orElse(new EmptyType());
+      elements.add(new StructElement(wrapFieldID, wraptlvValue));
+
+      final long lowestOffFieldID = 2L;
+      BaseTLVType lowestOfftlvValue = lowestOff.<BaseTLVType>map((nonOptionallowestOff) -> new BooleanType(nonOptionallowestOff)).orElse(new EmptyType());
+      elements.add(new StructElement(lowestOffFieldID, lowestOfftlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public interface PercentSettingAttributeCallback {
+    public interface PercentSettingAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface SpeedSettingAttributeCallback {
+    public interface SpeedSettingAttributeCallback 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 readFanModeAttribute(
         IntegerAttributeCallback callback) {
-        readFanModeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FAN_MODE_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void writeFanModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeFanModeAttribute(chipClusterPtr, callback, value, null);
+      writeFanModeAttribute(callback, value, 0);
     }
 
     public void writeFanModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeFanModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), FAN_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeFanModeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFanModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FAN_MODE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FAN_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readFanModeSequenceAttribute(
         IntegerAttributeCallback callback) {
-        readFanModeSequenceAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FAN_MODE_SEQUENCE_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeFanModeSequenceAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeFanModeSequenceAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FAN_MODE_SEQUENCE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, FAN_MODE_SEQUENCE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPercentSettingAttribute(
         PercentSettingAttributeCallback callback) {
-        readPercentSettingAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PERCENT_SETTING_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void writePercentSettingAttribute(DefaultClusterCallback callback, Integer value) {
-        writePercentSettingAttribute(chipClusterPtr, callback, value, null);
+      writePercentSettingAttribute(callback, value, 0);
     }
 
     public void writePercentSettingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writePercentSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), PERCENT_SETTING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribePercentSettingAttribute(
         PercentSettingAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePercentSettingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PERCENT_SETTING_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PERCENT_SETTING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPercentCurrentAttribute(
         IntegerAttributeCallback callback) {
-        readPercentCurrentAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PERCENT_CURRENT_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribePercentCurrentAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePercentCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PERCENT_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PERCENT_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSpeedMaxAttribute(
         IntegerAttributeCallback callback) {
-        readSpeedMaxAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPEED_MAX_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeSpeedMaxAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSpeedMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPEED_MAX_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SPEED_MAX_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSpeedSettingAttribute(
         SpeedSettingAttributeCallback callback) {
-        readSpeedSettingAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPEED_SETTING_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void writeSpeedSettingAttribute(DefaultClusterCallback callback, Integer value) {
-        writeSpeedSettingAttribute(chipClusterPtr, callback, value, null);
+      writeSpeedSettingAttribute(callback, value, 0);
     }
 
     public void writeSpeedSettingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeSpeedSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), SPEED_SETTING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeSpeedSettingAttribute(
         SpeedSettingAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSpeedSettingAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPEED_SETTING_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SPEED_SETTING_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSpeedCurrentAttribute(
         IntegerAttributeCallback callback) {
-        readSpeedCurrentAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPEED_CURRENT_ATTRIBUTE_ID);
+
+      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 void subscribeSpeedCurrentAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSpeedCurrentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SPEED_CURRENT_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, SPEED_CURRENT_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readRockSupportAttribute(
         IntegerAttributeCallback callback) {
-        readRockSupportAttribute(chipClusterPtr, 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 void subscribeRockSupportAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRockSupportAttribute(chipClusterPtr, callback, minInterval, 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 void readRockSettingAttribute(
         IntegerAttributeCallback callback) {
-        readRockSettingAttribute(chipClusterPtr, 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 void writeRockSettingAttribute(DefaultClusterCallback callback, Integer value) {
-        writeRockSettingAttribute(chipClusterPtr, callback, value, null);
+      writeRockSettingAttribute(callback, value, 0);
     }
 
     public void writeRockSettingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeRockSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ROCK_SETTING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeRockSettingAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeRockSettingAttribute(chipClusterPtr, callback, minInterval, 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 readWindSupportAttribute(
         IntegerAttributeCallback callback) {
-        readWindSupportAttribute(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 subscribeWindSupportAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWindSupportAttribute(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 readWindSettingAttribute(
         IntegerAttributeCallback callback) {
-        readWindSettingAttribute(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 writeWindSettingAttribute(DefaultClusterCallback callback, Integer value) {
-        writeWindSettingAttribute(chipClusterPtr, callback, value, null);
+      writeWindSettingAttribute(callback, value, 0);
     }
 
     public void writeWindSettingAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeWindSettingAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), WIND_SETTING_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeWindSettingAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWindSettingAttribute(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 readAirflowDirectionAttribute(
         IntegerAttributeCallback callback) {
-        readAirflowDirectionAttribute(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 writeAirflowDirectionAttribute(DefaultClusterCallback callback, Integer value) {
-        writeAirflowDirectionAttribute(chipClusterPtr, callback, value, null);
+      writeAirflowDirectionAttribute(callback, value, 0);
     }
 
     public void writeAirflowDirectionAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeAirflowDirectionAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), AIRFLOW_DIRECTION_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeAirflowDirectionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAirflowDirectionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, AIRFLOW_DIRECTION_ATTRIBUTE_ID);
+
+      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 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 readFanModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  public static class ThermostatUserInterfaceConfigurationCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 516L;
 
-    private native void writeFanModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    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;
 
-    private native void subscribeFanModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public ThermostatUserInterfaceConfigurationCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void readFanModeSequenceAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    @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 GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readPercentSettingAttribute(long chipClusterPtr, PercentSettingAttributeCallback callback);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void writePercentSettingAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribePercentSettingAttribute(long chipClusterPtr, PercentSettingAttributeCallback callback, int minInterval, int maxInterval);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readPercentCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readTemperatureDisplayModeAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEMPERATURE_DISPLAY_MODE_ATTRIBUTE_ID);
 
-    private native void subscribePercentCurrentAttribute(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);
+          }
+        }, TEMPERATURE_DISPLAY_MODE_ATTRIBUTE_ID, true);
+    }
 
-    private native void readSpeedMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeTemperatureDisplayModeAttribute(DefaultClusterCallback callback, Integer value) {
+      writeTemperatureDisplayModeAttribute(callback, value, 0);
+    }
 
-    private native void subscribeSpeedMaxAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    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);
+    }
 
-    private native void readSpeedSettingAttribute(long chipClusterPtr, SpeedSettingAttributeCallback callback);
+    public void subscribeTemperatureDisplayModeAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TEMPERATURE_DISPLAY_MODE_ATTRIBUTE_ID);
 
-    private native void writeSpeedSettingAttribute(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);
+          }
+        }, TEMPERATURE_DISPLAY_MODE_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void subscribeSpeedSettingAttribute(long chipClusterPtr, SpeedSettingAttributeCallback callback, int minInterval, int maxInterval);
+    public void readKeypadLockoutAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, KEYPAD_LOCKOUT_ATTRIBUTE_ID);
 
-    private native void readSpeedCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      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);
+    }
 
-    private native void subscribeSpeedCurrentAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void writeKeypadLockoutAttribute(DefaultClusterCallback callback, Integer value) {
+      writeKeypadLockoutAttribute(callback, value, 0);
+    }
 
-    private native void readRockSupportAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeKeypadLockoutAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), KEYPAD_LOCKOUT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
+    }
 
-    private native void subscribeRockSupportAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void subscribeKeypadLockoutAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, KEYPAD_LOCKOUT_ATTRIBUTE_ID);
 
-    private native void readRockSettingAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, KEYPAD_LOCKOUT_ATTRIBUTE_ID, minInterval, maxInterval);
+    }
 
-    private native void writeRockSettingAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    public void readScheduleProgrammingVisibilityAttribute(
+        IntegerAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SCHEDULE_PROGRAMMING_VISIBILITY_ATTRIBUTE_ID);
 
-    private native void subscribeRockSettingAttribute(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);
+          }
+        }, SCHEDULE_PROGRAMMING_VISIBILITY_ATTRIBUTE_ID, true);
+    }
 
-    private native void readWindSupportAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void writeScheduleProgrammingVisibilityAttribute(DefaultClusterCallback callback, Integer value) {
+      writeScheduleProgrammingVisibilityAttribute(callback, value, 0);
+    }
 
-    private native void subscribeWindSupportAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    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);
+    }
 
-    private native void readWindSettingAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public void subscribeScheduleProgrammingVisibilityAttribute(
+        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SCHEDULE_PROGRAMMING_VISIBILITY_ATTRIBUTE_ID);
 
-    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 = 516L;
-
-    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> 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 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);
+      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);
-    }
-
-    private native void readTemperatureDisplayModeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeTemperatureDisplayModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    private native void subscribeTemperatureDisplayModeAttribute(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 readKeypadLockoutAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  public static class ColorControlCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 768L;
 
-    private native void writeKeypadLockoutAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    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 subscribeKeypadLockoutAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public ColorControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    private native void readScheduleProgrammingVisibilityAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
-    private native void writeScheduleProgrammingVisibilityAttribute(long chipClusterPtr, DefaultClusterCallback callback, Integer value, @Nullable Integer timedWriteTimeoutMs);
+    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 subscribeScheduleProgrammingVisibilityAttribute(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 readGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long hueFieldID = 0L;
+      BaseTLVType huetlvValue = new UIntType(hue);
+      elements.add(new StructElement(hueFieldID, huetlvValue));
 
-    private native void subscribeGeneratedCommandListAttribute(long chipClusterPtr, GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      final long directionFieldID = 1L;
+      BaseTLVType directiontlvValue = new UIntType(direction);
+      elements.add(new StructElement(directionFieldID, directiontlvValue));
 
-    private native void readAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback);
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
 
-    private native void subscribeAcceptedCommandListAttribute(long chipClusterPtr, AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval);
+      final long optionsMaskFieldID = 3L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    private native void readEventListAttribute(long chipClusterPtr, EventListAttributeCallback callback);
+      final long optionsOverrideFieldID = 4L;
+      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 moveHue(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride) {
+      moveHue(callback, moveMode, rate, optionsMask, optionsOverride, 0);
+    }
 
-    private native void subscribeAttributeListAttribute(long chipClusterPtr, AttributeListAttributeCallback callback, int minInterval, int maxInterval);
+    public void moveHue(DefaultClusterCallback callback, Integer moveMode, 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 = new UIntType(rate);
+      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 ColorControlCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 768L;
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public ColorControlCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
+    public void stepHue(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
+      stepHue(callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, 0);
     }
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    public void stepHue(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
+      final long commandId = 2L;
 
-    public void moveToHue(DefaultClusterCallback callback, Integer hue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      moveToHue(chipClusterPtr, callback, hue, direction, 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 moveToHue(DefaultClusterCallback callback, Integer hue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      moveToHue(chipClusterPtr, callback, hue, direction, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
-    }
+      final long stepSizeFieldID = 1L;
+      BaseTLVType stepSizetlvValue = new UIntType(stepSize);
+      elements.add(new StructElement(stepSizeFieldID, stepSizetlvValue));
 
-    public void moveHue(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride) {
-      moveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
-    }
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
 
-    public void moveHue(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      moveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, timedInvokeTimeoutMs);
-    }
+      final long optionsMaskFieldID = 3L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    public void stepHue(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      stepHue(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 stepHue(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      stepHue(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 moveToSaturation(DefaultClusterCallback callback, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      moveToSaturation(chipClusterPtr, callback, saturation, transitionTime, optionsMask, optionsOverride, null);
+      moveToSaturation(callback, saturation, transitionTime, optionsMask, optionsOverride, 0);
     }
 
     public void moveToSaturation(DefaultClusterCallback callback, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      moveToSaturation(chipClusterPtr, callback, saturation, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+      final long commandId = 3L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long saturationFieldID = 0L;
+      BaseTLVType saturationtlvValue = new UIntType(saturation);
+      elements.add(new StructElement(saturationFieldID, saturationtlvValue));
+
+      final long transitionTimeFieldID = 1L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      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 moveSaturation(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride) {
-      moveSaturation(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
+      moveSaturation(callback, moveMode, rate, optionsMask, optionsOverride, 0);
     }
 
     public void moveSaturation(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      moveSaturation(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+      final long commandId = 4L;
+
+      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 = new UIntType(rate);
+      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 stepSaturation(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      stepSaturation(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, null);
+      stepSaturation(callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, 0);
     }
 
     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);
+      final long commandId = 5L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long stepModeFieldID = 0L;
+      BaseTLVType stepModetlvValue = new UIntType(stepMode);
+      elements.add(new StructElement(stepModeFieldID, stepModetlvValue));
+
+      final long stepSizeFieldID = 1L;
+      BaseTLVType stepSizetlvValue = new UIntType(stepSize);
+      elements.add(new StructElement(stepSizeFieldID, stepSizetlvValue));
+
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
+
+      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);
     }
 
     public void moveToHueAndSaturation(DefaultClusterCallback callback, Integer hue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      moveToHueAndSaturation(chipClusterPtr, callback, hue, saturation, transitionTime, optionsMask, optionsOverride, null);
+      moveToHueAndSaturation(callback, hue, saturation, transitionTime, optionsMask, optionsOverride, 0);
     }
 
     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);
+      final long commandId = 6L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long hueFieldID = 0L;
+      BaseTLVType huetlvValue = new UIntType(hue);
+      elements.add(new StructElement(hueFieldID, huetlvValue));
+
+      final long saturationFieldID = 1L;
+      BaseTLVType saturationtlvValue = new UIntType(saturation);
+      elements.add(new StructElement(saturationFieldID, saturationtlvValue));
+
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
+
+      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);
     }
 
     public void moveToColor(DefaultClusterCallback callback, Integer colorX, Integer colorY, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      moveToColor(chipClusterPtr, callback, colorX, colorY, transitionTime, optionsMask, optionsOverride, null);
+      moveToColor(callback, colorX, colorY, transitionTime, optionsMask, optionsOverride, 0);
     }
 
     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);
+      final long commandId = 7L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long colorXFieldID = 0L;
+      BaseTLVType colorXtlvValue = new UIntType(colorX);
+      elements.add(new StructElement(colorXFieldID, colorXtlvValue));
+
+      final long colorYFieldID = 1L;
+      BaseTLVType colorYtlvValue = new UIntType(colorY);
+      elements.add(new StructElement(colorYFieldID, colorYtlvValue));
+
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
+
+      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);
     }
 
     public void moveColor(DefaultClusterCallback callback, Integer rateX, Integer rateY, Integer optionsMask, Integer optionsOverride) {
-      moveColor(chipClusterPtr, callback, rateX, rateY, optionsMask, optionsOverride, null);
+      moveColor(callback, rateX, rateY, optionsMask, optionsOverride, 0);
     }
 
     public void moveColor(DefaultClusterCallback callback, Integer rateX, Integer rateY, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      moveColor(chipClusterPtr, callback, rateX, rateY, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+      final long commandId = 8L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long rateXFieldID = 0L;
+      BaseTLVType rateXtlvValue = new IntType(rateX);
+      elements.add(new StructElement(rateXFieldID, rateXtlvValue));
+
+      final long rateYFieldID = 1L;
+      BaseTLVType rateYtlvValue = new IntType(rateY);
+      elements.add(new StructElement(rateYFieldID, rateYtlvValue));
+
+      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 stepColor(DefaultClusterCallback callback, Integer stepX, Integer stepY, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      stepColor(chipClusterPtr, callback, stepX, stepY, transitionTime, optionsMask, optionsOverride, null);
+      stepColor(callback, stepX, stepY, transitionTime, optionsMask, optionsOverride, 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);
+      final long commandId = 9L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long stepXFieldID = 0L;
+      BaseTLVType stepXtlvValue = new IntType(stepX);
+      elements.add(new StructElement(stepXFieldID, stepXtlvValue));
+
+      final long stepYFieldID = 1L;
+      BaseTLVType stepYtlvValue = new IntType(stepY);
+      elements.add(new StructElement(stepYFieldID, stepYtlvValue));
+
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
+
+      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);
     }
 
     public void moveToColorTemperature(DefaultClusterCallback callback, Integer colorTemperatureMireds, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      moveToColorTemperature(chipClusterPtr, callback, colorTemperatureMireds, transitionTime, optionsMask, optionsOverride, null);
+      moveToColorTemperature(callback, colorTemperatureMireds, transitionTime, optionsMask, optionsOverride, 0);
     }
 
     public void moveToColorTemperature(DefaultClusterCallback callback, Integer colorTemperatureMireds, Integer transitionTime, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      moveToColorTemperature(chipClusterPtr, callback, colorTemperatureMireds, transitionTime, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+      final long commandId = 10L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long colorTemperatureMiredsFieldID = 0L;
+      BaseTLVType colorTemperatureMiredstlvValue = new UIntType(colorTemperatureMireds);
+      elements.add(new StructElement(colorTemperatureMiredsFieldID, colorTemperatureMiredstlvValue));
+
+      final long transitionTimeFieldID = 1L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      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 enhancedMoveToHue(DefaultClusterCallback callback, Integer enhancedHue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      enhancedMoveToHue(chipClusterPtr, callback, enhancedHue, direction, transitionTime, optionsMask, optionsOverride, null);
+      enhancedMoveToHue(callback, enhancedHue, direction, transitionTime, optionsMask, optionsOverride, 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);
+      final long commandId = 64L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long enhancedHueFieldID = 0L;
+      BaseTLVType enhancedHuetlvValue = new UIntType(enhancedHue);
+      elements.add(new StructElement(enhancedHueFieldID, enhancedHuetlvValue));
+
+      final long directionFieldID = 1L;
+      BaseTLVType directiontlvValue = new UIntType(direction);
+      elements.add(new StructElement(directionFieldID, directiontlvValue));
+
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
+
+      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);
     }
 
     public void enhancedMoveHue(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride) {
-      enhancedMoveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, null);
+      enhancedMoveHue(callback, moveMode, rate, optionsMask, optionsOverride, 0);
     }
 
     public void enhancedMoveHue(DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      enhancedMoveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride, timedInvokeTimeoutMs);
+      final long commandId = 65L;
+
+      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 = new UIntType(rate);
+      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 enhancedStepHue(DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      enhancedStepHue(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, null);
+      enhancedStepHue(callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride, 0);
     }
 
     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);
+      final long commandId = 66L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long stepModeFieldID = 0L;
+      BaseTLVType stepModetlvValue = new UIntType(stepMode);
+      elements.add(new StructElement(stepModeFieldID, stepModetlvValue));
+
+      final long stepSizeFieldID = 1L;
+      BaseTLVType stepSizetlvValue = new UIntType(stepSize);
+      elements.add(new StructElement(stepSizeFieldID, stepSizetlvValue));
+
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
+
+      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);
     }
 
     public void enhancedMoveToHueAndSaturation(DefaultClusterCallback callback, Integer enhancedHue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride) {
-      enhancedMoveToHueAndSaturation(chipClusterPtr, callback, enhancedHue, saturation, transitionTime, optionsMask, optionsOverride, null);
+      enhancedMoveToHueAndSaturation(callback, enhancedHue, saturation, transitionTime, optionsMask, optionsOverride, 0);
     }
 
     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);
+      final long commandId = 67L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long enhancedHueFieldID = 0L;
+      BaseTLVType enhancedHuetlvValue = new UIntType(enhancedHue);
+      elements.add(new StructElement(enhancedHueFieldID, enhancedHuetlvValue));
+
+      final long saturationFieldID = 1L;
+      BaseTLVType saturationtlvValue = new UIntType(saturation);
+      elements.add(new StructElement(saturationFieldID, saturationtlvValue));
+
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
+
+      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);
     }
 
     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);
+      colorLoopSet(callback, updateFlags, action, direction, time, startHue, optionsMask, optionsOverride, 0);
     }
 
     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);
+      final long commandId = 68L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long updateFlagsFieldID = 0L;
+      BaseTLVType updateFlagstlvValue = new UIntType(updateFlags);
+      elements.add(new StructElement(updateFlagsFieldID, updateFlagstlvValue));
+
+      final long actionFieldID = 1L;
+      BaseTLVType actiontlvValue = new UIntType(action);
+      elements.add(new StructElement(actionFieldID, actiontlvValue));
+
+      final long directionFieldID = 2L;
+      BaseTLVType directiontlvValue = new UIntType(direction);
+      elements.add(new StructElement(directionFieldID, directiontlvValue));
+
+      final long timeFieldID = 3L;
+      BaseTLVType timetlvValue = new UIntType(time);
+      elements.add(new StructElement(timeFieldID, timetlvValue));
+
+      final long startHueFieldID = 4L;
+      BaseTLVType startHuetlvValue = new UIntType(startHue);
+      elements.add(new StructElement(startHueFieldID, startHuetlvValue));
+
+      final long optionsMaskFieldID = 5L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
+
+      final long optionsOverrideFieldID = 6L;
+      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 stopMoveStep(DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride) {
-      stopMoveStep(chipClusterPtr, callback, optionsMask, optionsOverride, null);
+      stopMoveStep(callback, optionsMask, optionsOverride, 0);
     }
 
     public void stopMoveStep(DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride, int timedInvokeTimeoutMs) {
-      stopMoveStep(chipClusterPtr, callback, optionsMask, optionsOverride, timedInvokeTimeoutMs);
-    }
+      final long commandId = 71L;
 
-    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);
-    }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long optionsMaskFieldID = 0L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    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);
-    }
+      final long optionsOverrideFieldID = 1L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    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);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    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 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 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);
+    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 stepHue(long chipClusterPtr, DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long moveModeFieldID = 0L;
+      BaseTLVType moveModetlvValue = new UIntType(moveMode);
+      elements.add(new StructElement(moveModeFieldID, moveModetlvValue));
 
-    private native void moveToSaturation(long chipClusterPtr, DefaultClusterCallback callback, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      final long rateFieldID = 1L;
+      BaseTLVType ratetlvValue = new UIntType(rate);
+      elements.add(new StructElement(rateFieldID, ratetlvValue));
 
-    private native void moveSaturation(long chipClusterPtr, DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      final long colorTemperatureMinimumMiredsFieldID = 2L;
+      BaseTLVType colorTemperatureMinimumMiredstlvValue = new UIntType(colorTemperatureMinimumMireds);
+      elements.add(new StructElement(colorTemperatureMinimumMiredsFieldID, colorTemperatureMinimumMiredstlvValue));
 
-    private native void stepSaturation(long chipClusterPtr, DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      final long colorTemperatureMaximumMiredsFieldID = 3L;
+      BaseTLVType colorTemperatureMaximumMiredstlvValue = new UIntType(colorTemperatureMaximumMireds);
+      elements.add(new StructElement(colorTemperatureMaximumMiredsFieldID, colorTemperatureMaximumMiredstlvValue));
 
-    private native void moveToHueAndSaturation(long chipClusterPtr, DefaultClusterCallback callback, Integer hue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      final long optionsMaskFieldID = 4L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    private native void moveToColor(long chipClusterPtr, DefaultClusterCallback callback, Integer colorX, Integer colorY, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      final long optionsOverrideFieldID = 5L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    private native void moveColor(long chipClusterPtr, DefaultClusterCallback callback, Integer rateX, Integer rateY, 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 stepColor(long chipClusterPtr, DefaultClusterCallback callback, Integer stepX, Integer stepY, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+    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 moveToColorTemperature(long chipClusterPtr, DefaultClusterCallback callback, Integer colorTemperatureMireds, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+    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 enhancedMoveToHue(long chipClusterPtr, DefaultClusterCallback callback, Integer enhancedHue, Integer direction, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long stepModeFieldID = 0L;
+      BaseTLVType stepModetlvValue = new UIntType(stepMode);
+      elements.add(new StructElement(stepModeFieldID, stepModetlvValue));
 
-    private native void enhancedMoveHue(long chipClusterPtr, DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      final long stepSizeFieldID = 1L;
+      BaseTLVType stepSizetlvValue = new UIntType(stepSize);
+      elements.add(new StructElement(stepSizeFieldID, stepSizetlvValue));
 
-    private native void enhancedStepHue(long chipClusterPtr, DefaultClusterCallback callback, Integer stepMode, Integer stepSize, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      final long transitionTimeFieldID = 2L;
+      BaseTLVType transitionTimetlvValue = new UIntType(transitionTime);
+      elements.add(new StructElement(transitionTimeFieldID, transitionTimetlvValue));
 
-    private native void enhancedMoveToHueAndSaturation(long chipClusterPtr, DefaultClusterCallback callback, Integer enhancedHue, Integer saturation, Integer transitionTime, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      final long colorTemperatureMinimumMiredsFieldID = 3L;
+      BaseTLVType colorTemperatureMinimumMiredstlvValue = new UIntType(colorTemperatureMinimumMireds);
+      elements.add(new StructElement(colorTemperatureMinimumMiredsFieldID, colorTemperatureMinimumMiredstlvValue));
 
-    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);
+      final long colorTemperatureMaximumMiredsFieldID = 4L;
+      BaseTLVType colorTemperatureMaximumMiredstlvValue = new UIntType(colorTemperatureMaximumMireds);
+      elements.add(new StructElement(colorTemperatureMaximumMiredsFieldID, colorTemperatureMaximumMiredstlvValue));
 
-    private native void stopMoveStep(long chipClusterPtr, DefaultClusterCallback callback, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      final long optionsMaskFieldID = 5L;
+      BaseTLVType optionsMasktlvValue = new UIntType(optionsMask);
+      elements.add(new StructElement(optionsMaskFieldID, optionsMasktlvValue));
 
-    private native void moveColorTemperature(long chipClusterPtr, DefaultClusterCallback callback, Integer moveMode, Integer rate, Integer colorTemperatureMinimumMireds, Integer colorTemperatureMaximumMireds, Integer optionsMask, Integer optionsOverride, @Nullable Integer timedInvokeTimeoutMs);
+      final long optionsOverrideFieldID = 6L;
+      BaseTLVType optionsOverridetlvValue = new UIntType(optionsOverride);
+      elements.add(new StructElement(optionsOverrideFieldID, optionsOverridetlvValue));
 
-    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);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public interface NumberOfPrimariesAttributeCallback {
+    public interface NumberOfPrimariesAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface Primary1IntensityAttributeCallback {
+    public interface Primary1IntensityAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface Primary2IntensityAttributeCallback {
+    public interface Primary2IntensityAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface Primary3IntensityAttributeCallback {
+    public interface Primary3IntensityAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface Primary4IntensityAttributeCallback {
+    public interface Primary4IntensityAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface Primary5IntensityAttributeCallback {
+    public interface Primary5IntensityAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface Primary6IntensityAttributeCallback {
+    public interface Primary6IntensityAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ColorPointRIntensityAttributeCallback {
+    public interface ColorPointRIntensityAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ColorPointGIntensityAttributeCallback {
+    public interface ColorPointGIntensityAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ColorPointBIntensityAttributeCallback {
+    public interface ColorPointBIntensityAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface StartUpColorTemperatureMiredsAttributeCallback {
+    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 readCurrentHueAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentHueAttribute(chipClusterPtr, 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 subscribeCurrentHueAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentHueAttribute(chipClusterPtr, callback, minInterval, 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 readCurrentSaturationAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentSaturationAttribute(chipClusterPtr, 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 subscribeCurrentSaturationAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentSaturationAttribute(chipClusterPtr, callback, minInterval, 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 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 readCurrentXAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentXAttribute(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 subscribeCurrentXAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentXAttribute(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 readCurrentYAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentYAttribute(chipClusterPtr, 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 subscribeCurrentYAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentYAttribute(chipClusterPtr, callback, minInterval, 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 readDriftCompensationAttribute(
         IntegerAttributeCallback callback) {
-        readDriftCompensationAttribute(chipClusterPtr, 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 subscribeDriftCompensationAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDriftCompensationAttribute(chipClusterPtr, callback, minInterval, 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 readCompensationTextAttribute(
         CharStringAttributeCallback callback) {
-        readCompensationTextAttribute(chipClusterPtr, 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 subscribeCompensationTextAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCompensationTextAttribute(chipClusterPtr, callback, minInterval, 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 readColorTemperatureMiredsAttribute(
         IntegerAttributeCallback callback) {
-        readColorTemperatureMiredsAttribute(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 subscribeColorTemperatureMiredsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorTemperatureMiredsAttribute(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 readColorModeAttribute(
         IntegerAttributeCallback callback) {
-        readColorModeAttribute(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 subscribeColorModeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_MODE_ATTRIBUTE_ID);
+
+      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 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 readNumberOfPrimariesAttribute(
         NumberOfPrimariesAttributeCallback callback) {
-        readNumberOfPrimariesAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_PRIMARIES_ATTRIBUTE_ID);
+
+      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 subscribeNumberOfPrimariesAttribute(
         NumberOfPrimariesAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeNumberOfPrimariesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, NUMBER_OF_PRIMARIES_ATTRIBUTE_ID);
+
+      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 readPrimary1XAttribute(
         IntegerAttributeCallback callback) {
-        readPrimary1XAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY1_X_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribePrimary1XAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary1XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY1_X_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY1_X_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPrimary1YAttribute(
         IntegerAttributeCallback callback) {
-        readPrimary1YAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY1_Y_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribePrimary1YAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary1YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY1_Y_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY1_Y_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPrimary1IntensityAttribute(
         Primary1IntensityAttributeCallback callback) {
-        readPrimary1IntensityAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY1_INTENSITY_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribePrimary1IntensityAttribute(
         Primary1IntensityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary1IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY1_INTENSITY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY1_INTENSITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPrimary2XAttribute(
         IntegerAttributeCallback callback) {
-        readPrimary2XAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY2_X_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribePrimary2XAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary2XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY2_X_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY2_X_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPrimary2YAttribute(
         IntegerAttributeCallback callback) {
-        readPrimary2YAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY2_Y_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribePrimary2YAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary2YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY2_Y_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY2_Y_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPrimary2IntensityAttribute(
         Primary2IntensityAttributeCallback callback) {
-        readPrimary2IntensityAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY2_INTENSITY_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribePrimary2IntensityAttribute(
         Primary2IntensityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary2IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY2_INTENSITY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY2_INTENSITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPrimary3XAttribute(
         IntegerAttributeCallback callback) {
-        readPrimary3XAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY3_X_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribePrimary3XAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary3XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY3_X_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY3_X_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPrimary3YAttribute(
         IntegerAttributeCallback callback) {
-        readPrimary3YAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY3_Y_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribePrimary3YAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary3YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY3_Y_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY3_Y_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPrimary3IntensityAttribute(
         Primary3IntensityAttributeCallback callback) {
-        readPrimary3IntensityAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY3_INTENSITY_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribePrimary3IntensityAttribute(
         Primary3IntensityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary3IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY3_INTENSITY_ATTRIBUTE_ID);
+
+      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 void readPrimary4XAttribute(
         IntegerAttributeCallback callback) {
-        readPrimary4XAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY4_X_ATTRIBUTE_ID);
+
+      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 void subscribePrimary4XAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary4XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY4_X_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY4_X_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPrimary4YAttribute(
         IntegerAttributeCallback callback) {
-        readPrimary4YAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY4_Y_ATTRIBUTE_ID);
+
+      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 subscribePrimary4YAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary4YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY4_Y_ATTRIBUTE_ID);
+
+      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 readPrimary4IntensityAttribute(
         Primary4IntensityAttributeCallback callback) {
-        readPrimary4IntensityAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY4_INTENSITY_ATTRIBUTE_ID);
+
+      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 subscribePrimary4IntensityAttribute(
         Primary4IntensityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary4IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY4_INTENSITY_ATTRIBUTE_ID);
+
+      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 readPrimary5XAttribute(
         IntegerAttributeCallback callback) {
-        readPrimary5XAttribute(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 subscribePrimary5XAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary5XAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY5_X_ATTRIBUTE_ID);
+
+      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 readPrimary5YAttribute(
         IntegerAttributeCallback callback) {
-        readPrimary5YAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY5_Y_ATTRIBUTE_ID);
+
+      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 subscribePrimary5YAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary5YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY5_Y_ATTRIBUTE_ID);
+
+      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 readPrimary5IntensityAttribute(
         Primary5IntensityAttributeCallback callback) {
-        readPrimary5IntensityAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY5_INTENSITY_ATTRIBUTE_ID);
+
+      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 subscribePrimary5IntensityAttribute(
         Primary5IntensityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary5IntensityAttribute(chipClusterPtr, callback, minInterval, 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 readPrimary6XAttribute(
         IntegerAttributeCallback callback) {
-        readPrimary6XAttribute(chipClusterPtr, 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 subscribePrimary6XAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary6XAttribute(chipClusterPtr, callback, minInterval, 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 readPrimary6YAttribute(
         IntegerAttributeCallback callback) {
-        readPrimary6YAttribute(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 subscribePrimary6YAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary6YAttribute(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);
     }
 
     public void readPrimary6IntensityAttribute(
         Primary6IntensityAttributeCallback callback) {
-        readPrimary6IntensityAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY6_INTENSITY_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribePrimary6IntensityAttribute(
         Primary6IntensityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePrimary6IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PRIMARY6_INTENSITY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PRIMARY6_INTENSITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readWhitePointXAttribute(
         IntegerAttributeCallback callback) {
-        readWhitePointXAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WHITE_POINT_X_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void writeWhitePointXAttribute(DefaultClusterCallback callback, Integer value) {
-        writeWhitePointXAttribute(chipClusterPtr, callback, value, null);
+      writeWhitePointXAttribute(callback, value, 0);
     }
 
     public void writeWhitePointXAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeWhitePointXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), WHITE_POINT_X_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeWhitePointXAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWhitePointXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WHITE_POINT_X_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, WHITE_POINT_X_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readWhitePointYAttribute(
         IntegerAttributeCallback callback) {
-        readWhitePointYAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WHITE_POINT_Y_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void writeWhitePointYAttribute(DefaultClusterCallback callback, Integer value) {
-        writeWhitePointYAttribute(chipClusterPtr, callback, value, null);
+      writeWhitePointYAttribute(callback, value, 0);
     }
 
     public void writeWhitePointYAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeWhitePointYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), WHITE_POINT_Y_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeWhitePointYAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeWhitePointYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, WHITE_POINT_Y_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, WHITE_POINT_Y_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readColorPointRXAttribute(
         IntegerAttributeCallback callback) {
-        readColorPointRXAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_R_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_R_X_ATTRIBUTE_ID, true);
     }
 
     public void writeColorPointRXAttribute(DefaultClusterCallback callback, Integer value) {
-        writeColorPointRXAttribute(chipClusterPtr, callback, value, null);
+      writeColorPointRXAttribute(callback, value, 0);
     }
 
     public void writeColorPointRXAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeColorPointRXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_R_X_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeColorPointRXAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorPointRXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_R_X_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void readColorPointRYAttribute(
         IntegerAttributeCallback callback) {
-        readColorPointRYAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_R_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_R_Y_ATTRIBUTE_ID, true);
     }
 
     public void writeColorPointRYAttribute(DefaultClusterCallback callback, Integer value) {
-        writeColorPointRYAttribute(chipClusterPtr, callback, value, null);
+      writeColorPointRYAttribute(callback, value, 0);
     }
 
     public void writeColorPointRYAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeColorPointRYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_R_Y_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeColorPointRYAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorPointRYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_R_Y_ATTRIBUTE_ID);
+
+      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 void readColorPointRIntensityAttribute(
         ColorPointRIntensityAttributeCallback callback) {
-        readColorPointRIntensityAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_R_INTENSITY_ATTRIBUTE_ID);
+
+      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 writeColorPointRIntensityAttribute(DefaultClusterCallback callback, Integer value) {
-        writeColorPointRIntensityAttribute(chipClusterPtr, callback, value, null);
+      writeColorPointRIntensityAttribute(callback, value, 0);
     }
 
     public void writeColorPointRIntensityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeColorPointRIntensityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_R_INTENSITY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeColorPointRIntensityAttribute(
         ColorPointRIntensityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorPointRIntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_R_INTENSITY_ATTRIBUTE_ID);
+
+      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 readColorPointGXAttribute(
         IntegerAttributeCallback callback) {
-        readColorPointGXAttribute(chipClusterPtr, 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 writeColorPointGXAttribute(DefaultClusterCallback callback, Integer value) {
-        writeColorPointGXAttribute(chipClusterPtr, callback, value, null);
+      writeColorPointGXAttribute(callback, value, 0);
     }
 
     public void writeColorPointGXAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeColorPointGXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_G_X_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeColorPointGXAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorPointGXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_G_X_ATTRIBUTE_ID);
+
+      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 readColorPointGYAttribute(
         IntegerAttributeCallback callback) {
-        readColorPointGYAttribute(chipClusterPtr, 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 writeColorPointGYAttribute(DefaultClusterCallback callback, Integer value) {
-        writeColorPointGYAttribute(chipClusterPtr, callback, value, null);
+      writeColorPointGYAttribute(callback, value, 0);
     }
 
     public void writeColorPointGYAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeColorPointGYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_G_Y_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeColorPointGYAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorPointGYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_G_Y_ATTRIBUTE_ID);
+
+      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 readColorPointGIntensityAttribute(
         ColorPointGIntensityAttributeCallback callback) {
-        readColorPointGIntensityAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_G_INTENSITY_ATTRIBUTE_ID);
+
+      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 writeColorPointGIntensityAttribute(DefaultClusterCallback callback, Integer value) {
-        writeColorPointGIntensityAttribute(chipClusterPtr, callback, value, null);
+      writeColorPointGIntensityAttribute(callback, value, 0);
     }
 
     public void writeColorPointGIntensityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeColorPointGIntensityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_G_INTENSITY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeColorPointGIntensityAttribute(
         ColorPointGIntensityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorPointGIntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_G_INTENSITY_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void readColorPointBXAttribute(
         IntegerAttributeCallback callback) {
-        readColorPointBXAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_B_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_B_X_ATTRIBUTE_ID, true);
     }
 
     public void writeColorPointBXAttribute(DefaultClusterCallback callback, Integer value) {
-        writeColorPointBXAttribute(chipClusterPtr, callback, value, null);
+      writeColorPointBXAttribute(callback, value, 0);
     }
 
     public void writeColorPointBXAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeColorPointBXAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_B_X_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeColorPointBXAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorPointBXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_B_X_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void readColorPointBYAttribute(
         IntegerAttributeCallback callback) {
-        readColorPointBYAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_B_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_B_Y_ATTRIBUTE_ID, true);
     }
 
     public void writeColorPointBYAttribute(DefaultClusterCallback callback, Integer value) {
-        writeColorPointBYAttribute(chipClusterPtr, callback, value, null);
+      writeColorPointBYAttribute(callback, value, 0);
     }
 
     public void writeColorPointBYAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeColorPointBYAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_B_Y_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeColorPointBYAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorPointBYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_B_Y_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void readColorPointBIntensityAttribute(
         ColorPointBIntensityAttributeCallback callback) {
-        readColorPointBIntensityAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_POINT_B_INTENSITY_ATTRIBUTE_ID);
+
+      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 void writeColorPointBIntensityAttribute(DefaultClusterCallback callback, Integer value) {
-        writeColorPointBIntensityAttribute(chipClusterPtr, callback, value, null);
+      writeColorPointBIntensityAttribute(callback, value, 0);
     }
 
     public void writeColorPointBIntensityAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeColorPointBIntensityAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), COLOR_POINT_B_INTENSITY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeColorPointBIntensityAttribute(
         ColorPointBIntensityAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorPointBIntensityAttribute(chipClusterPtr, callback, minInterval, 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 readEnhancedCurrentHueAttribute(
         IntegerAttributeCallback callback) {
-        readEnhancedCurrentHueAttribute(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 subscribeEnhancedCurrentHueAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEnhancedCurrentHueAttribute(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 readEnhancedColorModeAttribute(
         IntegerAttributeCallback callback) {
-        readEnhancedColorModeAttribute(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 subscribeEnhancedColorModeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeEnhancedColorModeAttribute(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 readColorLoopActiveAttribute(
         IntegerAttributeCallback callback) {
-        readColorLoopActiveAttribute(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 subscribeColorLoopActiveAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorLoopActiveAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_LOOP_ACTIVE_ATTRIBUTE_ID);
+
+      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 readColorLoopDirectionAttribute(
         IntegerAttributeCallback callback) {
-        readColorLoopDirectionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_LOOP_DIRECTION_ATTRIBUTE_ID);
+
+      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 subscribeColorLoopDirectionAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorLoopDirectionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_LOOP_DIRECTION_ATTRIBUTE_ID);
+
+      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 readColorLoopTimeAttribute(
         IntegerAttributeCallback callback) {
-        readColorLoopTimeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_LOOP_TIME_ATTRIBUTE_ID);
+
+      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 subscribeColorLoopTimeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorLoopTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_LOOP_TIME_ATTRIBUTE_ID);
+
+      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 readColorLoopStartEnhancedHueAttribute(
         IntegerAttributeCallback callback) {
-        readColorLoopStartEnhancedHueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_LOOP_START_ENHANCED_HUE_ATTRIBUTE_ID);
+
+      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 subscribeColorLoopStartEnhancedHueAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorLoopStartEnhancedHueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_LOOP_START_ENHANCED_HUE_ATTRIBUTE_ID);
+
+      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 readColorLoopStoredEnhancedHueAttribute(
         IntegerAttributeCallback callback) {
-        readColorLoopStoredEnhancedHueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_LOOP_STORED_ENHANCED_HUE_ATTRIBUTE_ID);
+
+      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 subscribeColorLoopStoredEnhancedHueAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorLoopStoredEnhancedHueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_LOOP_STORED_ENHANCED_HUE_ATTRIBUTE_ID);
+
+      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 readColorCapabilitiesAttribute(
         IntegerAttributeCallback callback) {
-        readColorCapabilitiesAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_CAPABILITIES_ATTRIBUTE_ID);
+
+      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 subscribeColorCapabilitiesAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorCapabilitiesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_CAPABILITIES_ATTRIBUTE_ID);
+
+      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 readColorTempPhysicalMinMiredsAttribute(
         IntegerAttributeCallback callback) {
-        readColorTempPhysicalMinMiredsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_TEMP_PHYSICAL_MIN_MIREDS_ATTRIBUTE_ID);
+
+      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 subscribeColorTempPhysicalMinMiredsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorTempPhysicalMinMiredsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_TEMP_PHYSICAL_MIN_MIREDS_ATTRIBUTE_ID);
+
+      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 readColorTempPhysicalMaxMiredsAttribute(
         IntegerAttributeCallback callback) {
-        readColorTempPhysicalMaxMiredsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_TEMP_PHYSICAL_MAX_MIREDS_ATTRIBUTE_ID);
+
+      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 subscribeColorTempPhysicalMaxMiredsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeColorTempPhysicalMaxMiredsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COLOR_TEMP_PHYSICAL_MAX_MIREDS_ATTRIBUTE_ID);
+
+      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 readCoupleColorTempToLevelMinMiredsAttribute(
         IntegerAttributeCallback callback) {
-        readCoupleColorTempToLevelMinMiredsAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, COUPLE_COLOR_TEMP_TO_LEVEL_MIN_MIREDS_ATTRIBUTE_ID);
+
+      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 subscribeCoupleColorTempToLevelMinMiredsAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCoupleColorTempToLevelMinMiredsAttribute(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 readStartUpColorTemperatureMiredsAttribute(
         StartUpColorTemperatureMiredsAttributeCallback callback) {
-        readStartUpColorTemperatureMiredsAttribute(chipClusterPtr, 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 writeStartUpColorTemperatureMiredsAttribute(DefaultClusterCallback callback, Integer value) {
-        writeStartUpColorTemperatureMiredsAttribute(chipClusterPtr, callback, value, null);
+      writeStartUpColorTemperatureMiredsAttribute(callback, value, 0);
     }
 
     public void writeStartUpColorTemperatureMiredsAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeStartUpColorTemperatureMiredsAttribute(chipClusterPtr, callback, value, 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 subscribeStartUpColorTemperatureMiredsAttribute(
         StartUpColorTemperatureMiredsAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStartUpColorTemperatureMiredsAttribute(chipClusterPtr, callback, minInterval, 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);
-    }
-
-    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);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    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);
+      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 BallastConfigurationCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 769L;
 
+    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;
+
     public BallastConfigurationCluster(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 IntrinsicBallastFactorAttributeCallback {
+    public interface IntrinsicBallastFactorAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface BallastFactorAdjustmentAttributeCallback {
+    public interface BallastFactorAdjustmentAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface LampRatedHoursAttributeCallback {
+    public interface LampRatedHoursAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface LampBurnHoursAttributeCallback {
+    public interface LampBurnHoursAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface LampBurnHoursTripPointAttributeCallback {
+    public interface LampBurnHoursTripPointAttributeCallback 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 readPhysicalMinLevelAttribute(
         IntegerAttributeCallback callback) {
-        readPhysicalMinLevelAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_MIN_LEVEL_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribePhysicalMinLevelAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePhysicalMinLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_MIN_LEVEL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PHYSICAL_MIN_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readPhysicalMaxLevelAttribute(
         IntegerAttributeCallback callback) {
-        readPhysicalMaxLevelAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_MAX_LEVEL_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribePhysicalMaxLevelAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePhysicalMaxLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_MAX_LEVEL_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PHYSICAL_MAX_LEVEL_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readBallastStatusAttribute(
         IntegerAttributeCallback callback) {
-        readBallastStatusAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BALLAST_STATUS_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeBallastStatusAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBallastStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BALLAST_STATUS_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, BALLAST_STATUS_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 writeMinLevelAttribute(DefaultClusterCallback callback, Integer value) {
-        writeMinLevelAttribute(chipClusterPtr, callback, value, null);
+      writeMinLevelAttribute(callback, value, 0);
     }
 
     public void writeMinLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeMinLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), MIN_LEVEL_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     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 writeMaxLevelAttribute(DefaultClusterCallback callback, Integer value) {
-        writeMaxLevelAttribute(chipClusterPtr, callback, value, null);
+      writeMaxLevelAttribute(callback, value, 0);
     }
 
     public void writeMaxLevelAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeMaxLevelAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), MAX_LEVEL_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     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 readIntrinsicBallastFactorAttribute(
         IntrinsicBallastFactorAttributeCallback callback) {
-        readIntrinsicBallastFactorAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INTRINSIC_BALLAST_FACTOR_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void writeIntrinsicBallastFactorAttribute(DefaultClusterCallback callback, Integer value) {
-        writeIntrinsicBallastFactorAttribute(chipClusterPtr, callback, value, null);
+      writeIntrinsicBallastFactorAttribute(callback, value, 0);
     }
 
     public void writeIntrinsicBallastFactorAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeIntrinsicBallastFactorAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), INTRINSIC_BALLAST_FACTOR_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeIntrinsicBallastFactorAttribute(
         IntrinsicBallastFactorAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeIntrinsicBallastFactorAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INTRINSIC_BALLAST_FACTOR_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void readBallastFactorAdjustmentAttribute(
         BallastFactorAdjustmentAttributeCallback callback) {
-        readBallastFactorAdjustmentAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BALLAST_FACTOR_ADJUSTMENT_ATTRIBUTE_ID);
+
+      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 void writeBallastFactorAdjustmentAttribute(DefaultClusterCallback callback, Integer value) {
-        writeBallastFactorAdjustmentAttribute(chipClusterPtr, callback, value, null);
+      writeBallastFactorAdjustmentAttribute(callback, value, 0);
     }
 
     public void writeBallastFactorAdjustmentAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeBallastFactorAdjustmentAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), BALLAST_FACTOR_ADJUSTMENT_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeBallastFactorAdjustmentAttribute(
         BallastFactorAdjustmentAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeBallastFactorAdjustmentAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, BALLAST_FACTOR_ADJUSTMENT_ATTRIBUTE_ID);
+
+      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 void readLampQuantityAttribute(
         IntegerAttributeCallback callback) {
-        readLampQuantityAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAMP_QUANTITY_ATTRIBUTE_ID);
+
+      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 void subscribeLampQuantityAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLampQuantityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAMP_QUANTITY_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, LAMP_QUANTITY_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readLampTypeAttribute(
         CharStringAttributeCallback callback) {
-        readLampTypeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAMP_TYPE_ATTRIBUTE_ID);
+
+      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 void writeLampTypeAttribute(DefaultClusterCallback callback, String value) {
-        writeLampTypeAttribute(chipClusterPtr, callback, value, null);
+      writeLampTypeAttribute(callback, value, 0);
     }
 
     public void writeLampTypeAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-        writeLampTypeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new StringType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LAMP_TYPE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeLampTypeAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLampTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LAMP_TYPE_ATTRIBUTE_ID);
+
+      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 readLampManufacturerAttribute(
         CharStringAttributeCallback callback) {
-        readLampManufacturerAttribute(chipClusterPtr, 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 writeLampManufacturerAttribute(DefaultClusterCallback callback, String value) {
-        writeLampManufacturerAttribute(chipClusterPtr, callback, value, null);
+      writeLampManufacturerAttribute(callback, value, 0);
     }
 
     public void writeLampManufacturerAttribute(DefaultClusterCallback callback, String value, int timedWriteTimeoutMs) {
-        writeLampManufacturerAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new StringType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LAMP_MANUFACTURER_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeLampManufacturerAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLampManufacturerAttribute(chipClusterPtr, callback, minInterval, 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 readLampRatedHoursAttribute(
         LampRatedHoursAttributeCallback callback) {
-        readLampRatedHoursAttribute(chipClusterPtr, 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 writeLampRatedHoursAttribute(DefaultClusterCallback callback, Long value) {
-        writeLampRatedHoursAttribute(chipClusterPtr, callback, value, null);
+      writeLampRatedHoursAttribute(callback, value, 0);
     }
 
     public void writeLampRatedHoursAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeLampRatedHoursAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LAMP_RATED_HOURS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeLampRatedHoursAttribute(
         LampRatedHoursAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLampRatedHoursAttribute(chipClusterPtr, callback, minInterval, 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 readLampBurnHoursAttribute(
         LampBurnHoursAttributeCallback callback) {
-        readLampBurnHoursAttribute(chipClusterPtr, 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 writeLampBurnHoursAttribute(DefaultClusterCallback callback, Long value) {
-        writeLampBurnHoursAttribute(chipClusterPtr, callback, value, null);
+      writeLampBurnHoursAttribute(callback, value, 0);
     }
 
     public void writeLampBurnHoursAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeLampBurnHoursAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = value != null ? new UIntType(value) : new NullType();
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LAMP_BURN_HOURS_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeLampBurnHoursAttribute(
         LampBurnHoursAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLampBurnHoursAttribute(chipClusterPtr, callback, minInterval, 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 readLampAlarmModeAttribute(
         IntegerAttributeCallback callback) {
-        readLampAlarmModeAttribute(chipClusterPtr, 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 writeLampAlarmModeAttribute(DefaultClusterCallback callback, Integer value) {
-        writeLampAlarmModeAttribute(chipClusterPtr, callback, value, null);
+      writeLampAlarmModeAttribute(callback, value, 0);
     }
 
     public void writeLampAlarmModeAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeLampAlarmModeAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), LAMP_ALARM_MODE_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeLampAlarmModeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLampAlarmModeAttribute(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 readLampBurnHoursTripPointAttribute(
         LampBurnHoursTripPointAttributeCallback callback) {
-        readLampBurnHoursTripPointAttribute(chipClusterPtr, 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 writeLampBurnHoursTripPointAttribute(DefaultClusterCallback callback, Long value) {
-        writeLampBurnHoursTripPointAttribute(chipClusterPtr, callback, value, null);
+      writeLampBurnHoursTripPointAttribute(callback, value, 0);
     }
 
     public void writeLampBurnHoursTripPointAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeLampBurnHoursTripPointAttribute(chipClusterPtr, callback, value, 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 subscribeLampBurnHoursTripPointAttribute(
         LampBurnHoursTripPointAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLampBurnHoursTripPointAttribute(chipClusterPtr, callback, minInterval, 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);
+      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 IlluminanceMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1024L;
 
-    private native void subscribePhysicalMinLevelAttribute(long chipClusterPtr, IntegerAttributeCallback 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 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;
 
-    private native void readPhysicalMaxLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    public IlluminanceMeasurementCluster(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 interface MeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Integer value);
+    }
 
-    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 = 1024L;
-
-    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 {
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MaxMeasuredValueAttributeCallback {
+    public interface MaxMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface LightSensorTypeAttributeCallback {
+    public interface LightSensorTypeAttributeCallback 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);
+      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);
+
+      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 readToleranceAttribute(
         IntegerAttributeCallback callback) {
-        readToleranceAttribute(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 subscribeToleranceAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeToleranceAttribute(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 readLightSensorTypeAttribute(
         LightSensorTypeAttributeCallback callback) {
-        readLightSensorTypeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIGHT_SENSOR_TYPE_ATTRIBUTE_ID);
+
+      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 subscribeLightSensorTypeAttribute(
         LightSensorTypeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeLightSensorTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, LIGHT_SENSOR_TYPE_ATTRIBUTE_ID);
+
+      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 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 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);
+      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 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);
+      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 Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MinMeasuredValueAttributeCallback {
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MaxMeasuredValueAttributeCallback {
+    public interface MaxMeasuredValueAttributeCallback 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);
+      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);
+
+      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 readToleranceAttribute(
         IntegerAttributeCallback callback) {
-        readToleranceAttribute(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 subscribeToleranceAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeToleranceAttribute(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);
-    }
-
-    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);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    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);
+      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 PressureMeasurementCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1027L;
 
+    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);
+      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 Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MinMeasuredValueAttributeCallback {
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MaxMeasuredValueAttributeCallback {
+    public interface MaxMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface ScaledValueAttributeCallback {
+    public interface ScaledValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MinScaledValueAttributeCallback {
+    public interface MinScaledValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MaxScaledValueAttributeCallback {
+    public interface MaxScaledValueAttributeCallback 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);
+      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);
+
+      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 readToleranceAttribute(
         IntegerAttributeCallback callback) {
-        readToleranceAttribute(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 subscribeToleranceAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeToleranceAttribute(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 readScaledValueAttribute(
         ScaledValueAttributeCallback callback) {
-        readScaledValueAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, 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);
+          }
+        }, SCALED_VALUE_ATTRIBUTE_ID, true);
     }
 
     public void subscribeScaledValueAttribute(
         ScaledValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeScaledValueAttribute(chipClusterPtr, callback, minInterval, 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 readMinScaledValueAttribute(
         MinScaledValueAttributeCallback callback) {
-        readMinScaledValueAttribute(chipClusterPtr, 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 subscribeMinScaledValueAttribute(
         MinScaledValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMinScaledValueAttribute(chipClusterPtr, callback, minInterval, 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 readMaxScaledValueAttribute(
         MaxScaledValueAttributeCallback callback) {
-        readMaxScaledValueAttribute(chipClusterPtr, 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 subscribeMaxScaledValueAttribute(
         MaxScaledValueAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeMaxScaledValueAttribute(chipClusterPtr, callback, minInterval, 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 readScaledToleranceAttribute(
         IntegerAttributeCallback callback) {
-        readScaledToleranceAttribute(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 subscribeScaledToleranceAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeScaledToleranceAttribute(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 readScaleAttribute(
         IntegerAttributeCallback callback) {
-        readScaleAttribute(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 subscribeScaleAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeScaleAttribute(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);
-    }
-
-    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);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    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);
+      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 FlowMeasurementCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1028L;
 
+    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 FlowMeasurementCluster(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 MeasuredValueAttributeCallback {
+    public interface MeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MinMeasuredValueAttributeCallback {
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MaxMeasuredValueAttributeCallback {
+    public interface MaxMeasuredValueAttributeCallback 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);
+      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);
+
+      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 readToleranceAttribute(
         IntegerAttributeCallback callback) {
-        readToleranceAttribute(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 subscribeToleranceAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeToleranceAttribute(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);
-    }
-
-    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);
+      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 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);
+      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 Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MinMeasuredValueAttributeCallback {
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Integer value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface MaxMeasuredValueAttributeCallback {
+    public interface MaxMeasuredValueAttributeCallback 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);
+      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);
+
+      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 readToleranceAttribute(
         IntegerAttributeCallback callback) {
-        readToleranceAttribute(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 subscribeToleranceAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeToleranceAttribute(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);
-    }
-
-    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);
+      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 OccupancySensingCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1030L;
 
+    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;
+
     public OccupancySensingCluster(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 readOccupancyAttribute(
         IntegerAttributeCallback callback) {
-        readOccupancyAttribute(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 subscribeOccupancyAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOccupancyAttribute(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 readOccupancySensorTypeAttribute(
         IntegerAttributeCallback callback) {
-        readOccupancySensorTypeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPANCY_SENSOR_TYPE_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeOccupancySensorTypeAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOccupancySensorTypeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPANCY_SENSOR_TYPE_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, OCCUPANCY_SENSOR_TYPE_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readOccupancySensorTypeBitmapAttribute(
         IntegerAttributeCallback callback) {
-        readOccupancySensorTypeBitmapAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPANCY_SENSOR_TYPE_BITMAP_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeOccupancySensorTypeBitmapAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOccupancySensorTypeBitmapAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, OCCUPANCY_SENSOR_TYPE_BITMAP_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void readPIROccupiedToUnoccupiedDelayAttribute(
         IntegerAttributeCallback callback) {
-        readPIROccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_R_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void writePIROccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
-        writePIROccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, value, null);
+      writePIROccupiedToUnoccupiedDelayAttribute(callback, value, 0);
     }
 
     public void writePIROccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writePIROccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), P_I_R_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribePIROccupiedToUnoccupiedDelayAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePIROccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_R_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void readPIRUnoccupiedToOccupiedDelayAttribute(
         IntegerAttributeCallback callback) {
-        readPIRUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_R_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);
+          }
+        }, P_I_R_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, true);
     }
 
     public void writePIRUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
-        writePIRUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, value, null);
+      writePIRUnoccupiedToOccupiedDelayAttribute(callback, value, 0);
     }
 
     public void writePIRUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writePIRUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), P_I_R_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribePIRUnoccupiedToOccupiedDelayAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePIRUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_R_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void readPIRUnoccupiedToOccupiedThresholdAttribute(
         IntegerAttributeCallback callback) {
-        readPIRUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_R_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);
+          }
+        }, P_I_R_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID, true);
     }
 
     public void writePIRUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value) {
-        writePIRUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, value, null);
+      writePIRUnoccupiedToOccupiedThresholdAttribute(callback, value, 0);
     }
 
     public void writePIRUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writePIRUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), P_I_R_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribePIRUnoccupiedToOccupiedThresholdAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePIRUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, P_I_R_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID);
+
+      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 void readUltrasonicOccupiedToUnoccupiedDelayAttribute(
         IntegerAttributeCallback callback) {
-        readUltrasonicOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ULTRASONIC_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID);
+
+      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 void writeUltrasonicOccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
-        writeUltrasonicOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, value, null);
+      writeUltrasonicOccupiedToUnoccupiedDelayAttribute(callback, value, 0);
     }
 
     public void writeUltrasonicOccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeUltrasonicOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ULTRASONIC_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeUltrasonicOccupiedToUnoccupiedDelayAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUltrasonicOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ULTRASONIC_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID);
+
+      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 void readUltrasonicUnoccupiedToOccupiedDelayAttribute(
         IntegerAttributeCallback callback) {
-        readUltrasonicUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ULTRASONIC_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);
+          }
+        }, ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, true);
     }
 
     public void writeUltrasonicUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
-        writeUltrasonicUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, value, null);
+      writeUltrasonicUnoccupiedToOccupiedDelayAttribute(callback, value, 0);
     }
 
     public void writeUltrasonicUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeUltrasonicUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeUltrasonicUnoccupiedToOccupiedDelayAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUltrasonicUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID);
+
+      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 readUltrasonicUnoccupiedToOccupiedThresholdAttribute(
         IntegerAttributeCallback callback) {
-        readUltrasonicUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, 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 writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value) {
-        writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, value, null);
+      writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(callback, value, 0);
     }
 
     public void writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writeUltrasonicUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribeUltrasonicUnoccupiedToOccupiedThresholdAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeUltrasonicUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID);
+
+      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 readPhysicalContactOccupiedToUnoccupiedDelayAttribute(
         IntegerAttributeCallback callback) {
-        readPhysicalContactOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PHYSICAL_CONTACT_OCCUPIED_TO_UNOCCUPIED_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_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID, true);
     }
 
     public void writePhysicalContactOccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
-        writePhysicalContactOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, value, null);
+      writePhysicalContactOccupiedToUnoccupiedDelayAttribute(callback, value, 0);
     }
 
     public void writePhysicalContactOccupiedToUnoccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writePhysicalContactOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), PHYSICAL_CONTACT_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribePhysicalContactOccupiedToUnoccupiedDelayAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePhysicalContactOccupiedToUnoccupiedDelayAttribute(chipClusterPtr, callback, minInterval, 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 readPhysicalContactUnoccupiedToOccupiedDelayAttribute(
         IntegerAttributeCallback callback) {
-        readPhysicalContactUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, 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 writePhysicalContactUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value) {
-        writePhysicalContactUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, value, null);
+      writePhysicalContactUnoccupiedToOccupiedDelayAttribute(callback, value, 0);
     }
 
     public void writePhysicalContactUnoccupiedToOccupiedDelayAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writePhysicalContactUnoccupiedToOccupiedDelayAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribePhysicalContactUnoccupiedToOccupiedDelayAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePhysicalContactUnoccupiedToOccupiedDelayAttribute(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 readPhysicalContactUnoccupiedToOccupiedThresholdAttribute(
         IntegerAttributeCallback callback) {
-        readPhysicalContactUnoccupiedToOccupiedThresholdAttribute(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 writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value) {
-        writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, value, null);
+      writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(callback, value, 0);
     }
 
     public void writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
-        writePhysicalContactUnoccupiedToOccupiedThresholdAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      BaseTLVType tlvValue = new UIntType(value);
+      writeAttribute(new WriteAttributesCallbackImpl(callback), PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID, tlvValue, timedWriteTimeoutMs);
     }
 
     public void subscribePhysicalContactUnoccupiedToOccupiedThresholdAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePhysicalContactUnoccupiedToOccupiedThresholdAttribute(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 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);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    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);
+      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 CarbonMonoxideConcentrationMeasurementCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1036L;
 
+    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);
+      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);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    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 CarbonDioxideConcentrationMeasurementCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1037L;
 
+    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);
+      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);
+
+      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 NitrogenDioxideConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1043L;
 
-    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 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 readMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
+    public NitrogenDioxideConcentrationMeasurementCluster(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 Float value);
+    }
 
-    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void readPeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback);
+    public interface MaxMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public interface PeakMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public interface AverageMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void readUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback);
+      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 subscribeUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback 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 readMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+      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 subscribeMeasurementUnitAttribute(long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+    public void readMinMeasuredValueAttribute(
+        MinMeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MIN_MEASURED_VALUE_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);
-  }
-
-  public static class NitrogenDioxideConcentrationMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 1043L;
-
-    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> 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);
-    }
+      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);
+      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 OzoneConcentrationMeasurementCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1045L;
 
+    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);
+      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);
-
-    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 Pm25ConcentrationMeasurementCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1066L;
 
+    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);
+      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);
-
-    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 = 1067L;
-
-    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> 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 {
+    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);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    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 Pm1ConcentrationMeasurementCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1068L;
 
+    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 Pm1ConcentrationMeasurementCluster(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 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);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    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 Pm10ConcentrationMeasurementCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1069L;
 
+    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 Pm10ConcentrationMeasurementCluster(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 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);
+
+      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 TotalVolatileOrganicCompoundsConcentrationMeasurementCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1070L;
 
-    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 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 readMinMeasuredValueAttribute(long chipClusterPtr, MinMeasuredValueAttributeCallback callback);
+    public TotalVolatileOrganicCompoundsConcentrationMeasurementCluster(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 Float value);
+    }
 
-    private native void subscribeMaxMeasuredValueAttribute(long chipClusterPtr, MaxMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public interface MinMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void readPeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback);
+    public interface MaxMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void subscribePeakMeasuredValueAttribute(long chipClusterPtr, PeakMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public interface PeakMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void readPeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public interface AverageMeasuredValueAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(@Nullable Float value);
+    }
 
-    private native void subscribePeakMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback);
+    public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeAverageMeasuredValueAttribute(long chipClusterPtr, AverageMeasuredValueAttributeCallback callback, int minInterval, int maxInterval);
+    public interface EventListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void readAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    public interface AttributeListAttributeCallback extends BaseAttributeCallback {
+      void onSuccess(List<Long> value);
+    }
 
-    private native void subscribeAverageMeasuredValueWindowAttribute(long chipClusterPtr, LongAttributeCallback callback, int minInterval, int maxInterval);
+    public void readMeasuredValueAttribute(
+        MeasuredValueAttributeCallback callback) {
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MEASURED_VALUE_ATTRIBUTE_ID);
 
-    private native void readUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback callback);
+      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 subscribeUncertaintyAttribute(long chipClusterPtr, FloatAttributeCallback 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 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 = 1070L;
-
-    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> 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);
+      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);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    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 RadonConcentrationMeasurementCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1071L;
 
+    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 RadonConcentrationMeasurementCluster(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 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);
-
-    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 WakeOnLanCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1283L;
 
+    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);
+      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 readMACAddressAttribute(
         CharStringAttributeCallback callback) {
-        readMACAddressAttribute(chipClusterPtr, 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) {
-        subscribeMACAddressAttribute(chipClusterPtr, callback, minInterval, 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);
-    }
-
-    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);
+      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 ChannelCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1284L;
 
+    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;
+
     public ChannelCluster(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 changeChannel(ChangeChannelResponseCallback callback, String match) {
-      changeChannel(chipClusterPtr, callback, match, null);
+      changeChannel(callback, match, 0);
     }
 
     public void changeChannel(ChangeChannelResponseCallback callback, String match, int timedInvokeTimeoutMs) {
-      changeChannel(chipClusterPtr, callback, match, 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);
     }
 
     public void changeChannelByNumber(DefaultClusterCallback callback, Integer majorNumber, Integer minorNumber) {
-      changeChannelByNumber(chipClusterPtr, callback, majorNumber, minorNumber, null);
+      changeChannelByNumber(callback, majorNumber, minorNumber, 0);
     }
 
     public void changeChannelByNumber(DefaultClusterCallback callback, Integer majorNumber, Integer minorNumber, int timedInvokeTimeoutMs) {
-      changeChannelByNumber(chipClusterPtr, callback, majorNumber, minorNumber, timedInvokeTimeoutMs);
+      final long commandId = 2L;
+
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long majorNumberFieldID = 0L;
+      BaseTLVType majorNumbertlvValue = new UIntType(majorNumber);
+      elements.add(new StructElement(majorNumberFieldID, majorNumbertlvValue));
+
+      final long minorNumberFieldID = 1L;
+      BaseTLVType minorNumbertlvValue = new UIntType(minorNumber);
+      elements.add(new StructElement(minorNumberFieldID, minorNumbertlvValue));
+
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
     public void skipChannel(DefaultClusterCallback callback, Integer count) {
-      skipChannel(chipClusterPtr, callback, count, null);
+      skipChannel(callback, count, 0);
     }
 
     public void skipChannel(DefaultClusterCallback callback, Integer count, int timedInvokeTimeoutMs) {
-      skipChannel(chipClusterPtr, callback, count, timedInvokeTimeoutMs);
-    }
+      final long commandId = 3L;
 
-    private native void changeChannel(long chipClusterPtr, ChangeChannelResponseCallback callback, String match, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long countFieldID = 0L;
+      BaseTLVType counttlvValue = new IntType(count);
+      elements.add(new StructElement(countFieldID, counttlvValue));
 
-    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);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
 
-    public interface ChangeChannelResponseCallback {
+    public interface ChangeChannelResponseCallback extends BaseClusterCallback {
       void onSuccess(Integer status, Optional<String> data);
-      void onError(Exception error);
     }
 
-    public interface ChannelListAttributeCallback {
+    public interface ChannelListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.ChannelClusterChannelInfoStruct> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface LineupAttributeCallback {
+    public interface LineupAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable ChipStructs.ChannelClusterLineupInfoStruct value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface CurrentChannelAttributeCallback {
+    public interface CurrentChannelAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable ChipStructs.ChannelClusterChannelInfoStruct 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 readChannelListAttribute(
         ChannelListAttributeCallback callback) {
-        readChannelListAttribute(chipClusterPtr, 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) {
-        subscribeChannelListAttribute(chipClusterPtr, callback, minInterval, 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) {
-        readLineupAttribute(chipClusterPtr, 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) {
-        subscribeLineupAttribute(chipClusterPtr, callback, minInterval, 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) {
-        readCurrentChannelAttribute(chipClusterPtr, 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) {
-        subscribeCurrentChannelAttribute(chipClusterPtr, callback, minInterval, 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 readChannelListAttribute(long chipClusterPtr, ChannelListAttributeCallback callback);
-
-    private native void subscribeChannelListAttribute(long chipClusterPtr, ChannelListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readLineupAttribute(long chipClusterPtr, LineupAttributeCallback callback);
-
-    private native void subscribeLineupAttribute(long chipClusterPtr, LineupAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCurrentChannelAttribute(long chipClusterPtr, CurrentChannelAttributeCallback callback);
-
-    private native void subscribeCurrentChannelAttribute(long chipClusterPtr, CurrentChannelAttributeCallback 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 TargetNavigatorCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1285L;
 
+    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 TargetNavigatorCluster(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 navigateTarget(NavigateTargetResponseCallback callback, Integer target, Optional<String> data) {
-      navigateTarget(chipClusterPtr, callback, target, data, null);
+      navigateTarget(callback, target, data, 0);
     }
 
     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 {
+      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 TargetListAttributeCallback {
+    public interface TargetListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.TargetNavigatorClusterTargetInfoStruct> 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 readTargetListAttribute(
         TargetListAttributeCallback callback) {
-        readTargetListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGET_LIST_ATTRIBUTE_ID);
+
+      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 subscribeTargetListAttribute(
         TargetListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeTargetListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TARGET_LIST_ATTRIBUTE_ID);
+
+      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 readCurrentTargetAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentTargetAttribute(chipClusterPtr, 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 subscribeCurrentTargetAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentTargetAttribute(chipClusterPtr, callback, minInterval, 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 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);
+      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 MediaPlaybackCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1286L;
 
+    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;
+
     public MediaPlaybackCluster(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 play(PlaybackResponseCallback callback) {
-      play(chipClusterPtr, callback, null);
+      play(callback, 0);
     }
 
     public void play(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
-      play(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) {
+          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 pause(PlaybackResponseCallback callback) {
-      pause(chipClusterPtr, callback, null);
+      pause(callback, 0);
     }
 
     public void pause(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
-      pause(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) {
+          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 stop(PlaybackResponseCallback callback) {
-      stop(chipClusterPtr, callback, null);
+      stop(callback, 0);
     }
 
     public void stop(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
-      stop(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) {
+          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 startOver(PlaybackResponseCallback callback) {
-      startOver(chipClusterPtr, callback, null);
+      startOver(callback, 0);
     }
 
     public void startOver(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
-      startOver(chipClusterPtr, callback, 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 previous(PlaybackResponseCallback callback) {
-      previous(chipClusterPtr, callback, null);
+      previous(callback, 0);
     }
 
     public void previous(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
-      previous(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) {
+          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 next(PlaybackResponseCallback callback) {
-      next(chipClusterPtr, callback, null);
+      next(callback, 0);
     }
 
     public void next(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
-      next(chipClusterPtr, callback, 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 void rewind(PlaybackResponseCallback callback) {
-      rewind(chipClusterPtr, callback, null);
+      rewind(callback, 0);
     }
 
     public void rewind(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
-      rewind(chipClusterPtr, callback, 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 void fastForward(PlaybackResponseCallback callback) {
-      fastForward(chipClusterPtr, callback, null);
+      fastForward(callback, 0);
     }
 
     public void fastForward(PlaybackResponseCallback callback, int timedInvokeTimeoutMs) {
-      fastForward(chipClusterPtr, callback, 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 void skipForward(PlaybackResponseCallback callback, Long deltaPositionMilliseconds) {
-      skipForward(chipClusterPtr, callback, deltaPositionMilliseconds, null);
+      skipForward(callback, deltaPositionMilliseconds, 0);
     }
 
     public void skipForward(PlaybackResponseCallback callback, Long deltaPositionMilliseconds, int timedInvokeTimeoutMs) {
-      skipForward(chipClusterPtr, callback, deltaPositionMilliseconds, 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 skipBackward(PlaybackResponseCallback callback, Long deltaPositionMilliseconds) {
-      skipBackward(chipClusterPtr, callback, deltaPositionMilliseconds, null);
+      skipBackward(callback, deltaPositionMilliseconds, 0);
     }
 
     public void skipBackward(PlaybackResponseCallback callback, Long deltaPositionMilliseconds, int timedInvokeTimeoutMs) {
-      skipBackward(chipClusterPtr, callback, deltaPositionMilliseconds, 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 seek(PlaybackResponseCallback callback, Long position) {
-      seek(chipClusterPtr, callback, position, null);
+      seek(callback, position, 0);
     }
 
     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 {
+      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);
-      void onError(Exception error);
     }
 
-    public interface StartTimeAttributeCallback {
+    public interface StartTimeAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface DurationAttributeCallback {
+    public interface DurationAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface SampledPositionAttributeCallback {
+    public interface SampledPositionAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable ChipStructs.MediaPlaybackClusterPlaybackPositionStruct value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface SeekRangeEndAttributeCallback {
+    public interface SeekRangeEndAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable Long value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface SeekRangeStartAttributeCallback {
+    public interface SeekRangeStartAttributeCallback 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 readCurrentStateAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentStateAttribute(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 subscribeCurrentStateAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentStateAttribute(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);
     }
 
     public void readStartTimeAttribute(
         StartTimeAttributeCallback callback) {
-        readStartTimeAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_TIME_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeStartTimeAttribute(
         StartTimeAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeStartTimeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, START_TIME_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, START_TIME_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readDurationAttribute(
         DurationAttributeCallback callback) {
-        readDurationAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DURATION_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeDurationAttribute(
         DurationAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeDurationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DURATION_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            @Nullable Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, DURATION_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSampledPositionAttribute(
         SampledPositionAttributeCallback callback) {
-        readSampledPositionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SAMPLED_POSITION_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeSampledPositionAttribute(
         SampledPositionAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSampledPositionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SAMPLED_POSITION_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void readPlaybackSpeedAttribute(
         FloatAttributeCallback callback) {
-        readPlaybackSpeedAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PLAYBACK_SPEED_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribePlaybackSpeedAttribute(
         FloatAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribePlaybackSpeedAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PLAYBACK_SPEED_ATTRIBUTE_ID);
+
+      subscribeAttribute(new ReportCallbackImpl(callback, path) {
+          @Override
+          public void onSuccess(byte[] tlv) {
+            Float value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv);
+          }
+        }, PLAYBACK_SPEED_ATTRIBUTE_ID, minInterval, maxInterval);
     }
 
     public void readSeekRangeEndAttribute(
         SeekRangeEndAttributeCallback callback) {
-        readSeekRangeEndAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SEEK_RANGE_END_ATTRIBUTE_ID);
+
+      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);
     }
 
     public void subscribeSeekRangeEndAttribute(
         SeekRangeEndAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSeekRangeEndAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SEEK_RANGE_END_ATTRIBUTE_ID);
+
+      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 readSeekRangeStartAttribute(
         SeekRangeStartAttributeCallback callback) {
-        readSeekRangeStartAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SEEK_RANGE_START_ATTRIBUTE_ID);
+
+      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 subscribeSeekRangeStartAttribute(
         SeekRangeStartAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSeekRangeStartAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SEEK_RANGE_START_ATTRIBUTE_ID);
+
+      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);
-    }
-
-    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 readSampledPositionAttribute(long chipClusterPtr, SampledPositionAttributeCallback callback);
-
-    private native void subscribeSampledPositionAttribute(long chipClusterPtr, SampledPositionAttributeCallback 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);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    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);
+      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 MediaInputCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1287L;
 
+    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;
+
     public MediaInputCluster(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 selectInput(DefaultClusterCallback callback, Integer index) {
-      selectInput(chipClusterPtr, callback, index, null);
+      selectInput(callback, index, 0);
     }
 
     public void selectInput(DefaultClusterCallback callback, Integer index, int timedInvokeTimeoutMs) {
-      selectInput(chipClusterPtr, callback, index, 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 showInputStatus(DefaultClusterCallback callback) {
-      showInputStatus(chipClusterPtr, callback, null);
+      showInputStatus(callback, 0);
     }
 
     public void showInputStatus(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      showInputStatus(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 hideInputStatus(DefaultClusterCallback callback) {
-      hideInputStatus(chipClusterPtr, callback, null);
+      hideInputStatus(callback, 0);
     }
 
     public void hideInputStatus(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      hideInputStatus(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 renameInput(DefaultClusterCallback callback, Integer index, String name) {
-      renameInput(chipClusterPtr, callback, index, name, null);
+      renameInput(callback, index, name, 0);
     }
 
     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);
+      final long commandId = 3L;
 
-    private native void showInputStatus(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long indexFieldID = 0L;
+      BaseTLVType indextlvValue = new UIntType(index);
+      elements.add(new StructElement(indexFieldID, indextlvValue));
 
-    private native void hideInputStatus(long chipClusterPtr, DefaultClusterCallback callback, @Nullable Integer timedInvokeTimeoutMs);
+      final long nameFieldID = 1L;
+      BaseTLVType nametlvValue = new StringType(name);
+      elements.add(new StructElement(nameFieldID, nametlvValue));
 
-    private native void renameInput(long chipClusterPtr, DefaultClusterCallback callback, Integer index, String name, @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 InputListAttributeCallback {
+    public interface InputListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.MediaInputClusterInputInfoStruct> 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 readInputListAttribute(
         InputListAttributeCallback callback) {
-        readInputListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INPUT_LIST_ATTRIBUTE_ID);
+
+      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 subscribeInputListAttribute(
         InputListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeInputListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, INPUT_LIST_ATTRIBUTE_ID);
+
+      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 readCurrentInputAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentInputAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_INPUT_ATTRIBUTE_ID);
+
+      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 subscribeCurrentInputAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentInputAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_INPUT_ATTRIBUTE_ID);
+
+      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);
-    }
-
-    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);
+      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 LowPowerCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1288L;
 
+    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 LowPowerCluster(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 sleep(DefaultClusterCallback callback) {
-      sleep(chipClusterPtr, callback, null);
+      sleep(callback, 0);
     }
 
     public void sleep(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
-      sleep(chipClusterPtr, callback, timedInvokeTimeoutMs);
-    }
+      final long commandId = 0L;
 
-    private native void sleep(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 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);
-
-    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 KeypadInputCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1289L;
 
+    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 KeypadInputCluster(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 sendKey(SendKeyResponseCallback callback, Integer keyCode) {
-      sendKey(chipClusterPtr, callback, keyCode, null);
+      sendKey(callback, keyCode, 0);
     }
 
     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 {
+      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);
-      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);
+      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 ContentLauncherCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1290L;
 
+    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;
+
     public ContentLauncherCluster(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 launchContent(LauncherResponseCallback callback, ChipStructs.ContentLauncherClusterContentSearchStruct search, Boolean autoPlay, Optional<String> data) {
-      launchContent(chipClusterPtr, callback, search, autoPlay, data, null);
+      launchContent(callback, search, autoPlay, data, 0);
     }
 
     public void launchContent(LauncherResponseCallback callback, ChipStructs.ContentLauncherClusterContentSearchStruct search, Boolean autoPlay, Optional<String> data, int timedInvokeTimeoutMs) {
-      launchContent(chipClusterPtr, callback, search, autoPlay, data, 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 launchURL(LauncherResponseCallback callback, String contentURL, Optional<String> displayString, Optional<ChipStructs.ContentLauncherClusterBrandingInformationStruct> brandingInformation) {
-      launchURL(chipClusterPtr, callback, contentURL, displayString, brandingInformation, null);
+      launchURL(callback, contentURL, displayString, brandingInformation, 0);
     }
 
     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 {
+      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);
-      void onError(Exception error);
     }
 
-    public interface AcceptHeaderAttributeCallback {
+    public interface AcceptHeaderAttributeCallback 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 readAcceptHeaderAttribute(
         AcceptHeaderAttributeCallback callback) {
-        readAcceptHeaderAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPT_HEADER_ATTRIBUTE_ID);
+
+      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 subscribeAcceptHeaderAttribute(
         AcceptHeaderAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcceptHeaderAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPT_HEADER_ATTRIBUTE_ID);
+
+      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 readSupportedStreamingProtocolsAttribute(
         LongAttributeCallback callback) {
-        readSupportedStreamingProtocolsAttribute(chipClusterPtr, callback);
-    }
-
-    public void writeSupportedStreamingProtocolsAttribute(DefaultClusterCallback callback, Long value) {
-        writeSupportedStreamingProtocolsAttribute(chipClusterPtr, callback, value, null);
-    }
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_STREAMING_PROTOCOLS_ATTRIBUTE_ID);
 
-    public void writeSupportedStreamingProtocolsAttribute(DefaultClusterCallback callback, Long value, int timedWriteTimeoutMs) {
-        writeSupportedStreamingProtocolsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+      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 subscribeSupportedStreamingProtocolsAttribute(
         LongAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeSupportedStreamingProtocolsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, SUPPORTED_STREAMING_PROTOCOLS_ATTRIBUTE_ID);
+
+      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 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 readAcceptHeaderAttribute(long chipClusterPtr, AcceptHeaderAttributeCallback 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 subscribeAcceptHeaderAttribute(long chipClusterPtr, AcceptHeaderAttributeCallback callback, int minInterval, int maxInterval);
+  public static class AudioOutputCluster extends BaseChipCluster {
+    public static final long CLUSTER_ID = 1291L;
 
-    private native void readSupportedStreamingProtocolsAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    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;
 
-    private native void writeSupportedStreamingProtocolsAttribute(long chipClusterPtr, DefaultClusterCallback callback, Long value, @Nullable Integer timedWriteTimeoutMs);
+    public AudioOutputCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId, CLUSTER_ID);
+    }
 
-    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 = 1291L;
-
-    public AudioOutputCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
-
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Override
+    @Deprecated
+    public long initWithDevice(long devicePtr, int endpointId) {
+      return 0L;
+    }
 
     public void selectOutput(DefaultClusterCallback callback, Integer index) {
-      selectOutput(chipClusterPtr, callback, index, null);
+      selectOutput(callback, index, 0);
     }
 
     public void selectOutput(DefaultClusterCallback callback, Integer index, int timedInvokeTimeoutMs) {
-      selectOutput(chipClusterPtr, callback, index, 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 renameOutput(DefaultClusterCallback callback, Integer index, String name) {
-      renameOutput(chipClusterPtr, callback, index, name, null);
+      renameOutput(callback, index, name, 0);
     }
 
     public void renameOutput(DefaultClusterCallback callback, Integer index, String name, int timedInvokeTimeoutMs) {
-      renameOutput(chipClusterPtr, callback, index, name, timedInvokeTimeoutMs);
-    }
+      final long commandId = 1L;
 
-    private native void selectOutput(long chipClusterPtr, DefaultClusterCallback callback, Integer index, @Nullable Integer timedInvokeTimeoutMs);
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long indexFieldID = 0L;
+      BaseTLVType indextlvValue = new UIntType(index);
+      elements.add(new StructElement(indexFieldID, indextlvValue));
 
-    private native void renameOutput(long chipClusterPtr, DefaultClusterCallback callback, Integer index, String name, @Nullable Integer timedInvokeTimeoutMs);
+      final long nameFieldID = 1L;
+      BaseTLVType nametlvValue = new StringType(name);
+      elements.add(new StructElement(nameFieldID, nametlvValue));
 
-    public interface OutputListAttributeCallback {
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
+    }
+
+    public interface OutputListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<ChipStructs.AudioOutputClusterOutputInfoStruct> 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 readOutputListAttribute(
         OutputListAttributeCallback callback) {
-        readOutputListAttribute(chipClusterPtr, 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 subscribeOutputListAttribute(
         OutputListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeOutputListAttribute(chipClusterPtr, callback, minInterval, 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 readCurrentOutputAttribute(
         IntegerAttributeCallback callback) {
-        readCurrentOutputAttribute(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 subscribeCurrentOutputAttribute(
         IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentOutputAttribute(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 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 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);
+      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 ApplicationLauncherCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1292L;
 
+    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);
+      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 launchApp(LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application, Optional<byte[]> data) {
-      launchApp(chipClusterPtr, callback, application, data, null);
+      launchApp(callback, application, data, 0);
     }
 
     public void launchApp(LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application, Optional<byte[]> data, int timedInvokeTimeoutMs) {
-      launchApp(chipClusterPtr, callback, application, data, 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 stopApp(LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application) {
-      stopApp(chipClusterPtr, callback, application, null);
+      stopApp(callback, application, 0);
     }
 
     public void stopApp(LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application, int timedInvokeTimeoutMs) {
-      stopApp(chipClusterPtr, callback, application, 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 hideApp(LauncherResponseCallback callback, Optional<ChipStructs.ApplicationLauncherClusterApplicationStruct> application) {
-      hideApp(chipClusterPtr, callback, application, null);
+      hideApp(callback, application, 0);
     }
 
     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 {
+      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);
-      void onError(Exception error);
     }
 
-    public interface CatalogListAttributeCallback {
+    public interface CatalogListAttributeCallback extends BaseAttributeCallback {
       void onSuccess(List<Integer> value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface CurrentAppAttributeCallback {
+    public interface CurrentAppAttributeCallback extends BaseAttributeCallback {
       void onSuccess(@Nullable ChipStructs.ApplicationLauncherClusterApplicationEPStruct 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 readCatalogListAttribute(
         CatalogListAttributeCallback callback) {
-        readCatalogListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CATALOG_LIST_ATTRIBUTE_ID);
+
+      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 subscribeCatalogListAttribute(
         CatalogListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCatalogListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CATALOG_LIST_ATTRIBUTE_ID);
+
+      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 readCurrentAppAttribute(
         CurrentAppAttributeCallback callback) {
-        readCurrentAppAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_APP_ATTRIBUTE_ID);
+
+      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 subscribeCurrentAppAttribute(
         CurrentAppAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeCurrentAppAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CURRENT_APP_ATTRIBUTE_ID);
+
+      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 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 readCatalogListAttribute(long chipClusterPtr, CatalogListAttributeCallback callback);
-
-    private native void subscribeCatalogListAttribute(long chipClusterPtr, CatalogListAttributeCallback callback, int minInterval, int maxInterval);
-
-    private native void readCurrentAppAttribute(long chipClusterPtr, CurrentAppAttributeCallback callback);
-
-    private native void subscribeCurrentAppAttribute(long chipClusterPtr, CurrentAppAttributeCallback 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);
+      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 ApplicationBasicCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1293L;
 
+    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 ApplicationBasicCluster(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 ApplicationAttributeCallback {
+    public interface ApplicationAttributeCallback extends BaseAttributeCallback {
       void onSuccess(ChipStructs.ApplicationBasicClusterApplicationStruct value);
-      void onError(Exception ex);
-      default void onSubscriptionEstablished(long subscriptionId) {}
     }
 
-    public interface AllowedVendorListAttributeCallback {
+    public interface AllowedVendorListAttributeCallback 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 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 readApplicationNameAttribute(
         CharStringAttributeCallback callback) {
-        readApplicationNameAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPLICATION_NAME_ATTRIBUTE_ID);
+
+      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 subscribeApplicationNameAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeApplicationNameAttribute(chipClusterPtr, callback, minInterval, 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 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 readApplicationAttribute(
         ApplicationAttributeCallback callback) {
-        readApplicationAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPLICATION_ATTRIBUTE_ID);
+
+      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 subscribeApplicationAttribute(
         ApplicationAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeApplicationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPLICATION_ATTRIBUTE_ID);
+
+      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 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 readApplicationVersionAttribute(
         CharStringAttributeCallback callback) {
-        readApplicationVersionAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPLICATION_VERSION_ATTRIBUTE_ID);
+
+      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 subscribeApplicationVersionAttribute(
         CharStringAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeApplicationVersionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, APPLICATION_VERSION_ATTRIBUTE_ID);
+
+      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 readAllowedVendorListAttribute(
         AllowedVendorListAttributeCallback callback) {
-        readAllowedVendorListAttribute(chipClusterPtr, callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALLOWED_VENDOR_LIST_ATTRIBUTE_ID);
+
+      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 subscribeAllowedVendorListAttribute(
         AllowedVendorListAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAllowedVendorListAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ALLOWED_VENDOR_LIST_ATTRIBUTE_ID);
+
+      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 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 readVendorNameAttribute(long chipClusterPtr, CharStringAttributeCallback callback);
+      ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID);
 
-    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 readApplicationAttribute(long chipClusterPtr, ApplicationAttributeCallback callback);
-
-    private native void subscribeApplicationAttribute(long chipClusterPtr, ApplicationAttributeCallback 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);
+      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 AccountLoginCluster extends BaseChipCluster {
     public static final long CLUSTER_ID = 1294L;
 
+    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 AccountLoginCluster(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 getSetupPIN(GetSetupPINResponseCallback callback, String tempAccountIdentifier, int timedInvokeTimeoutMs) {
-      getSetupPIN(chipClusterPtr, callback, tempAccountIdentifier, 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 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> 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);
-    }
+      final long commandId = 2L;
 
-    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);
-  }
+      ArrayList<StructElement> elements = new ArrayList<>();
+      final long tempAccountIdentifierFieldID = 0L;
+      BaseTLVType tempAccountIdentifiertlvValue = new StringType(tempAccountIdentifier);
+      elements.add(new StructElement(tempAccountIdentifierFieldID, tempAccountIdentifiertlvValue));
 
-  public static class ElectricalMeasurementCluster extends BaseChipCluster {
-    public static final long CLUSTER_ID = 2820L;
-
-    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);
-    }
+      final long setupPINFieldID = 1L;
+      BaseTLVType setupPINtlvValue = new StringType(setupPIN);
+      elements.add(new StructElement(setupPINFieldID, setupPINtlvValue));
 
-    public void getMeasurementProfileCommand(DefaultClusterCallback callback, Integer attributeId, Long startTime, Integer numberOfIntervals) {
-      getMeasurementProfileCommand(chipClusterPtr, callback, attributeId, startTime, numberOfIntervals, null);
+      StructType value = new StructType(elements);
+      invoke(new InvokeCallbackImpl(callback) {
+          @Override
+          public void onResponse(StructType invokeStructValue) {
+          callback.onSuccess();
+        }}, commandId, value, timedInvokeTimeoutMs);
     }
 
-    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 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 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 logout(DefaultClusterCallback callback, int timedInvokeTimeoutMs) {
+      final long commandId = 3L;
 
-    public void subscribeAcActivePowerOverloadAttribute(
-        IntegerAttributeCallback callback, int minInterval, int maxInterval) {
-        subscribeAcActivePowerOverloadAttribute(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 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 5c4f9a7b529dc7..9c48ad3dcdcb70 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();
@@ -598,6 +1428,9 @@ public String toString() {
 public static class WiFiNetworkDiagnosticsClusterAssociationFailureEvent {
   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 associationFailureCause,
     Integer status
@@ -606,6 +1439,39 @@ public WiFiNetworkDiagnosticsClusterAssociationFailureEvent(
     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();
@@ -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();
@@ -890,6 +2134,11 @@ public static class RefrigeratorAlarmClusterNotifyEvent {
   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,
@@ -902,6 +2151,55 @@ public RefrigeratorAlarmClusterNotifyEvent(
     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();
@@ -924,12 +2222,39 @@ public String 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() {
     StringBuilder output = new StringBuilder();
@@ -943,12 +2268,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 +2314,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 +2360,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 +2406,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 +2455,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 +2472,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 +2543,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 +2591,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 +2605,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 +2665,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 +2713,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 +2727,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 +2785,375 @@ 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 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 +3167,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 +3218,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 +3241,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 +3340,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 +3366,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 +3476,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 +3502,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 +3611,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 +3634,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 +3727,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 52c8d1f85958bf..843b68318831b9 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,149 @@ public String toString() {
     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 +3950,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 +4001,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 +4015,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 +4076,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 +4087,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 +4138,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 +4152,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 +4213,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 +4224,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 +4275,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 +4289,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 +4350,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 +4361,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 +4412,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 +4426,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 +4487,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 +4498,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 +4549,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 +4563,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 +4624,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 +4635,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 +4686,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 +4700,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();
@@ -1834,6 +4761,9 @@ public String 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
@@ -1842,6 +4772,39 @@ public MicrowaveOvenModeClusterModeTagStruct(
     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();
@@ -1860,6 +4823,10 @@ 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,
@@ -1870,6 +4837,47 @@ public MicrowaveOvenModeClusterModeOptionStruct(
     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();
@@ -1891,6 +4899,10 @@ 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,
@@ -1901,6 +4913,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();
@@ -1921,6 +4974,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
@@ -1929,6 +4985,39 @@ 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();
@@ -1947,6 +5036,10 @@ 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,
@@ -1957,6 +5050,47 @@ public RvcOperationalStateClusterErrorStateStruct(
     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();
@@ -1977,6 +5111,9 @@ public String 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
@@ -1985,6 +5122,39 @@ public RvcOperationalStateClusterOperationalStateStruct(
     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();
@@ -2002,6 +5172,9 @@ public String 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
@@ -2010,6 +5183,39 @@ public HepaFilterMonitoringClusterReplacementProductStruct(
     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();
@@ -2027,6 +5233,9 @@ public String 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
@@ -2035,6 +5244,39 @@ public ActivatedCarbonFilterMonitoringClusterReplacementProductStruct(
     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();
@@ -2049,9 +5291,680 @@ public String toString() {
     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("DemandResponseLoadControlClusterTemperatureControlStruct {\n");
+    output.append("\tcoolingTempOffset: ");
+    output.append(coolingTempOffset);
+    output.append("\n");
+    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 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.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("DemandResponseLoadControlClusterLoadControlEventTransitionStruct {\n");
+    output.append("\tduration: ");
+    output.append(duration);
+    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 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.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("DemandResponseLoadControlClusterLoadControlEventStruct {\n");
+    output.append("\teventID: ");
+    output.append(Arrays.toString(eventID));
+    output.append("\n");
+    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 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.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("DemandResponseLoadControlClusterLoadControlProgramStruct {\n");
+    output.append("\tprogramID: ");
+    output.append(Arrays.toString(programID));
+    output.append("\n");
+    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 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
@@ -2060,6 +5973,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();
@@ -2078,6 +6024,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,
@@ -2088,6 +6038,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();
@@ -2111,6 +6102,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,
@@ -2125,6 +6122,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();
@@ -2153,6 +6207,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,
@@ -2165,6 +6224,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();
@@ -2188,6 +6296,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
@@ -2196,6 +6307,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();
@@ -2213,6 +6357,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
@@ -2221,6 +6368,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();
@@ -2240,6 +6420,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,
@@ -2252,6 +6437,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();
@@ -2276,6 +6510,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,
@@ -2286,6 +6524,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();
@@ -2306,6 +6585,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
@@ -2314,6 +6596,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();
@@ -2332,6 +6647,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,
@@ -2342,6 +6661,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();
@@ -2361,12 +6721,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();
@@ -2382,6 +6769,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,
@@ -2392,6 +6783,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();
@@ -2416,6 +6848,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,
@@ -2432,6 +6871,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();
@@ -2462,6 +6966,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,
@@ -2472,6 +6980,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();
@@ -2492,6 +7041,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
@@ -2500,6 +7052,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();
@@ -2517,6 +7102,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
@@ -2525,6 +7113,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();
@@ -2542,6 +7163,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
@@ -2550,6 +7174,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();
@@ -2573,6 +7230,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,
@@ -2593,6 +7259,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();
@@ -2634,6 +7381,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,
@@ -2654,6 +7410,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();
@@ -2699,6 +7536,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,
@@ -2727,6 +7577,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();
@@ -2775,6 +7738,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,
@@ -2785,6 +7752,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();
@@ -2810,6 +7818,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,
@@ -2828,6 +7844,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();
@@ -2859,12 +7948,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();
@@ -2879,6 +7995,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
@@ -2887,6 +8006,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 5e0e5dffe641b9..b28850721a73a2 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java
@@ -151,6 +151,12 @@ public static BaseCluster getCluster(long clusterId) {
         if (clusterId == IcdManagement.ID) {
             return new IcdManagement();
         }
+        if (clusterId == Timer.ID) {
+            return new Timer();
+        }
+        if (clusterId == OvenMode.ID) {
+            return new OvenMode();
+        }
         if (clusterId == ModeSelect.ID) {
             return new ModeSelect();
         }
@@ -205,6 +211,15 @@ 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 == DoorLock.ID) {
             return new DoorLock();
         }
@@ -673,7 +688,7 @@ public enum Attribute {
             NameSupport(4L),
             LastConfiguredBy(5L),
             SceneTableSize(6L),
-            RemainingCapacity(7L),
+            FabricSceneInfo(7L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -2341,6 +2356,8 @@ public enum Attribute {
             UniqueID(18L),
             CapabilityMinima(19L),
             ProductAppearance(20L),
+            SpecificationVersion(21L),
+            MaxPathsPerInvoke(22L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -3471,7 +3488,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;
@@ -3506,7 +3524,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;
@@ -3591,6 +3609,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();
@@ -6106,19 +6141,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),
@@ -6165,7 +6197,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;
@@ -6183,17 +6218,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;
                         }
@@ -6230,8 +6299,8 @@ 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 OvenMode implements BaseCluster {
+        public static final long ID = 73L;
         public long getID() {
             return ID;
         }
@@ -6352,17 +6421,19 @@ 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 ModeSelect implements BaseCluster {
+        public static final long ID = 80L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
-            SupportedModes(0L),
-            CurrentMode(1L),
-            StartUpMode(2L),
-            OnMode(3L),
+            Description(0L),
+            StandardNamespace(1L),
+            SupportedModes(2L),
+            CurrentMode(3L),
+            StartUpMode(4L),
+            OnMode(5L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -6474,17 +6545,17 @@ 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 LaundryWasherMode implements BaseCluster {
+        public static final long ID = 81L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
-            SpinSpeeds(0L),
-            SpinSpeedCurrent(1L),
-            NumberOfRinses(2L),
-            SupportedRinses(3L),
+            SupportedModes(0L),
+            CurrentMode(1L),
+            StartUpMode(2L),
+            OnMode(3L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -6530,7 +6601,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;
@@ -6548,7 +6620,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();
         }
@@ -6578,8 +6667,8 @@ 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 RefrigeratorAndTemperatureControlledCabinetMode implements BaseCluster {
+        public static final long ID = 82L;
         public long getID() {
             return ID;
         }
@@ -6587,6 +6676,7 @@ public long getID() {
         public enum Attribute {
             SupportedModes(0L),
             CurrentMode(1L),
+            StartUpMode(2L),
             OnMode(3L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
@@ -6699,16 +6789,17 @@ 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 LaundryWasherControls implements BaseCluster {
+        public static final long ID = 83L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
-            SupportedModes(0L),
-            CurrentMode(1L),
-            OnMode(3L),
+            SpinSpeeds(0L),
+            SpinSpeedCurrent(1L),
+            NumberOfRinses(2L),
+            SupportedRinses(3L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -6754,8 +6845,7 @@ public static Event value(long id) throws NoSuchFieldError {
             }
         }
 
-        public enum Command {
-            ChangeToMode(0L),;
+        public enum Command {;
             private final long id;
             Command(long id) {
                 this.id = id;
@@ -6773,24 +6863,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();
         }
@@ -6820,19 +6893,16 @@ 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 RvcRunMode implements BaseCluster {
+        public static final long ID = 84L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
-            TemperatureSetpoint(0L),
-            MinTemperature(1L),
-            MaxTemperature(2L),
-            Step(3L),
-            SelectedTemperatureLevel(4L),
-            SupportedTemperatureLevels(5L),
+            SupportedModes(0L),
+            CurrentMode(1L),
+            OnMode(3L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -6879,7 +6949,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;
@@ -6897,17 +6967,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;
                         }
@@ -6944,16 +7014,16 @@ 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 RvcCleanMode implements BaseCluster {
+        public static final long ID = 85L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
-            Mask(0L),
-            State(2L),
-            Supported(3L),
+            SupportedModes(0L),
+            CurrentMode(1L),
+            OnMode(3L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -6979,8 +7049,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;
@@ -7000,7 +7069,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;
@@ -7018,7 +7088,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();
         }
@@ -7048,17 +7135,19 @@ 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 TemperatureControl implements BaseCluster {
+        public static final long ID = 86L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
-            SupportedModes(0L),
-            CurrentMode(1L),
-            StartUpMode(2L),
-            OnMode(3L),
+            TemperatureSetpoint(0L),
+            MinTemperature(1L),
+            MaxTemperature(2L),
+            Step(3L),
+            SelectedTemperatureLevel(4L),
+            SupportedTemperatureLevels(5L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -7105,7 +7194,7 @@ public static Event value(long id) throws NoSuchFieldError {
         }
 
         public enum Command {
-            ChangeToMode(0L),;
+            SetTemperature(0L),;
             private final long id;
             Command(long id) {
                 this.id = id;
@@ -7123,17 +7212,17 @@ public static Command value(long id) throws NoSuchFieldError {
                 }
                 throw new NoSuchFieldError();
             }
-        }public enum ChangeToModeCommandField {NewMode(0),;
+        }public enum SetTemperatureCommandField {TargetTemperature(0),TargetTemperatureLevel(1),;
                     private final int id;
-                    ChangeToModeCommandField(int id) {
+                    SetTemperatureCommandField(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 SetTemperatureCommandField value(int id) throws NoSuchFieldError {
+                        for (SetTemperatureCommandField field : SetTemperatureCommandField.values()) {
                         if (field.getID() == id) {
                             return field;
                         }
@@ -7170,14 +7259,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 RefrigeratorAlarm implements BaseCluster {
+        public static final long ID = 87L;
         public long getID() {
             return ID;
         }
 
         public enum Attribute {
-            AirQuality(0L),
+            Mask(0L),
+            State(2L),
+            Supported(3L),
             GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
@@ -7203,7 +7294,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;
@@ -7271,27 +7363,250 @@ 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 DishwasherMode implements BaseCluster {
+        public static final long ID = 89L;
         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),
-            GeneratedCommandList(65528L),
+            SupportedModes(0L),
+            CurrentMode(1L),
+            StartUpMode(2L),
+            OnMode(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 {;
+            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 {
+            ChangeToMode(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 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();
+        }
+
+        @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 AirQuality implements BaseCluster {
+        public static final long ID = 91L;
+        public long getID() {
+            return ID;
+        }
+
+        public enum Attribute {
+            AirQuality(0L),
+            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 SmokeCoAlarm implements BaseCluster {
+        public static final long ID = 92L;
+        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),
+            GeneratedCommandList(65528L),
             AcceptedCommandList(65529L),
             EventList(65530L),
             AttributeList(65531L),
@@ -8218,6 +8533,462 @@ 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 {
+            DeviceClass(0L),
+            LoadControlPrograms(1L),
+            NumberOfLoadControlPrograms(2L),
+            Events(3L),
+            ActiveEvents(4L),
+            NumberOfEventsPerProgram(5L),
+            NumberOfTransistions(6L),
+            DefaultRandomStart(7L),
+            DefaultRandomDuration(8L),
+            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 DoorLock implements BaseCluster {
         public static final long ID = 257L;
         public long getID() {
@@ -11968,6 +12739,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 1e6066ef4643ac..d78e402dd39e9f 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
@@ -6577,91 +6626,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 {
-    private ClusterCommandCallback callback;
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(List<ChipStructs.ModeSelectClusterModeOptionStruct> valueList) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ModeSelectClusterModeOptionStruct>");
-      responseValues.put(commandResponseInfo, valueList);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception ex) {
-      callback.onFailure(ex);
-    }
-  }
-
-  public static class DelegatedModeSelectClusterStartUpModeAttributeCallback implements ChipClusters.ModeSelectCluster.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 DelegatedModeSelectClusterOnModeAttributeCallback implements ChipClusters.ModeSelectCluster.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 DelegatedModeSelectClusterGeneratedCommandListAttributeCallback implements ChipClusters.ModeSelectCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedTimerClusterGeneratedCommandListAttributeCallback implements ChipClusters.TimerCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6682,7 +6647,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedModeSelectClusterAcceptedCommandListAttributeCallback implements ChipClusters.ModeSelectCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedTimerClusterAcceptedCommandListAttributeCallback implements ChipClusters.TimerCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6703,7 +6668,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedModeSelectClusterEventListAttributeCallback implements ChipClusters.ModeSelectCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedTimerClusterEventListAttributeCallback implements ChipClusters.TimerCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6724,7 +6689,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedModeSelectClusterAttributeListAttributeCallback implements ChipClusters.ModeSelectCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedTimerClusterAttributeListAttributeCallback implements ChipClusters.TimerCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6746,7 +6711,7 @@ public void onError(Exception ex) {
   }
 
 
-  public static class DelegatedLaundryWasherModeClusterChangeToModeResponseCallback implements ChipClusters.LaundryWasherModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenModeClusterChangeToModeResponseCallback implements ChipClusters.OvenModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6769,7 +6734,7 @@ public void onError(Exception error) {
       callback.onFailure(error);
     }
   }
-  public static class DelegatedLaundryWasherModeClusterSupportedModesAttributeCallback implements ChipClusters.LaundryWasherModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenModeClusterSupportedModesAttributeCallback implements ChipClusters.OvenModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6777,9 +6742,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.LaundryWasherModeClusterModeOptionStruct> valueList) {
+    public void onSuccess(List<ChipStructs.OvenModeClusterModeOptionStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.LaundryWasherModeClusterModeOptionStruct>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.OvenModeClusterModeOptionStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6790,7 +6755,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherModeClusterStartUpModeAttributeCallback implements ChipClusters.LaundryWasherModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenModeClusterStartUpModeAttributeCallback implements ChipClusters.OvenModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6811,7 +6776,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherModeClusterOnModeAttributeCallback implements ChipClusters.LaundryWasherModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenModeClusterOnModeAttributeCallback implements ChipClusters.OvenModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6832,7 +6797,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.OvenModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6853,7 +6818,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.OvenModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6874,7 +6839,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherModeClusterEventListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenModeClusterEventListAttributeCallback implements ChipClusters.OvenModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6895,7 +6860,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherModeClusterAttributeListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedOvenModeClusterAttributeListAttributeCallback implements ChipClusters.OvenModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6916,8 +6881,7 @@ public void onError(Exception ex) {
     }
   }
 
-
-  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedModeSelectClusterStandardNamespaceAttributeCallback implements ChipClusters.ModeSelectCluster.StandardNamespaceAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6925,22 +6889,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 DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterSupportedModesAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+
+  public static class DelegatedModeSelectClusterSupportedModesAttributeCallback implements ChipClusters.ModeSelectCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6948,9 +6910,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct> valueList) {
+    public void onSuccess(List<ChipStructs.ModeSelectClusterModeOptionStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ModeSelectClusterModeOptionStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -6961,7 +6923,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterStartUpModeAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedModeSelectClusterStartUpModeAttributeCallback implements ChipClusters.ModeSelectCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -6982,7 +6944,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterOnModeAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedModeSelectClusterOnModeAttributeCallback implements ChipClusters.ModeSelectCluster.OnModeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7003,7 +6965,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedModeSelectClusterGeneratedCommandListAttributeCallback implements ChipClusters.ModeSelectCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7024,7 +6986,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedModeSelectClusterAcceptedCommandListAttributeCallback implements ChipClusters.ModeSelectCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7045,7 +7007,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterEventListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedModeSelectClusterEventListAttributeCallback implements ChipClusters.ModeSelectCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7066,7 +7028,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterAttributeListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedModeSelectClusterAttributeListAttributeCallback implements ChipClusters.ModeSelectCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7087,7 +7049,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherControlsClusterSpinSpeedsAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.SpinSpeedsAttributeCallback, DelegatedClusterCallback {
+
+  public static class DelegatedLaundryWasherModeClusterChangeToModeResponseCallback implements ChipClusters.LaundryWasherModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7095,9 +7058,32 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<String> valueList) {
+    public void onSuccess(Integer status, Optional<String> statusText) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<String>");
+
+      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 DelegatedLaundryWasherModeClusterSupportedModesAttributeCallback implements ChipClusters.LaundryWasherModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.LaundryWasherModeClusterModeOptionStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.LaundryWasherModeClusterModeOptionStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -7108,7 +7094,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherControlsClusterSpinSpeedCurrentAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.SpinSpeedCurrentAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherModeClusterStartUpModeAttributeCallback implements ChipClusters.LaundryWasherModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7129,7 +7115,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherControlsClusterSupportedRinsesAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.SupportedRinsesAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherModeClusterOnModeAttributeCallback implements ChipClusters.LaundryWasherModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7137,10 +7123,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Integer> valueList) {
+    public void onSuccess(@Nullable Integer value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -7150,7 +7136,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherControlsClusterGeneratedCommandListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7171,7 +7157,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherControlsClusterAcceptedCommandListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7192,7 +7178,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherControlsClusterEventListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherModeClusterEventListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7213,7 +7199,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedLaundryWasherControlsClusterAttributeListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherModeClusterAttributeListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7235,7 +7221,7 @@ public void onError(Exception ex) {
   }
 
 
-  public static class DelegatedRvcRunModeClusterChangeToModeResponseCallback implements ChipClusters.RvcRunModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7258,7 +7244,7 @@ public void onError(Exception error) {
       callback.onFailure(error);
     }
   }
-  public static class DelegatedRvcRunModeClusterSupportedModesAttributeCallback implements ChipClusters.RvcRunModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterSupportedModesAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7266,9 +7252,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.RvcRunModeClusterModeOptionStruct> valueList) {
+    public void onSuccess(List<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RvcRunModeClusterModeOptionStruct>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -7279,7 +7265,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcRunModeClusterOnModeAttributeCallback implements ChipClusters.RvcRunModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterStartUpModeAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7300,7 +7286,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcRunModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcRunModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterOnModeAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7308,10 +7294,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);
     }
 
@@ -7321,7 +7307,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcRunModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcRunModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7342,7 +7328,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcRunModeClusterEventListAttributeCallback implements ChipClusters.RvcRunModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7363,7 +7349,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcRunModeClusterAttributeListAttributeCallback implements ChipClusters.RvcRunModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterEventListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7384,8 +7370,7 @@ public void onError(Exception ex) {
     }
   }
 
-
-  public static class DelegatedRvcCleanModeClusterChangeToModeResponseCallback implements ChipClusters.RvcCleanModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterAttributeListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7393,22 +7378,20 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer status, Optional<String> statusText) {
+    public void onSuccess(List<Long> 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<Long>");
+      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 DelegatedRvcCleanModeClusterSupportedModesAttributeCallback implements ChipClusters.RvcCleanModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+
+  public static class DelegatedLaundryWasherControlsClusterSpinSpeedsAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.SpinSpeedsAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7416,9 +7399,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.RvcCleanModeClusterModeOptionStruct> valueList) {
+    public void onSuccess(List<String> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RvcCleanModeClusterModeOptionStruct>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<String>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -7429,7 +7412,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcCleanModeClusterOnModeAttributeCallback implements ChipClusters.RvcCleanModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherControlsClusterSpinSpeedCurrentAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.SpinSpeedCurrentAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7450,7 +7433,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcCleanModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcCleanModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherControlsClusterSupportedRinsesAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.SupportedRinsesAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7458,9 +7441,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<Integer> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Integer>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -7471,7 +7454,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcCleanModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcCleanModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherControlsClusterGeneratedCommandListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7492,7 +7475,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcCleanModeClusterEventListAttributeCallback implements ChipClusters.RvcCleanModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherControlsClusterAcceptedCommandListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7513,7 +7496,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcCleanModeClusterAttributeListAttributeCallback implements ChipClusters.RvcCleanModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedLaundryWasherControlsClusterEventListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7534,28 +7517,7 @@ public void onError(Exception 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 {
+  public static class DelegatedLaundryWasherControlsClusterAttributeListAttributeCallback implements ChipClusters.LaundryWasherControlsCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7576,7 +7538,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTemperatureControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.TemperatureControlCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+
+  public static class DelegatedRvcRunModeClusterChangeToModeResponseCallback implements ChipClusters.RvcRunModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7584,20 +7547,22 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(Integer status, Optional<String> statusText) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
-      responseValues.put(commandResponseInfo, valueList);
+
+      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 ex) {
-      callback.onFailure(ex);
+    public void onError(Exception error) {
+      callback.onFailure(error);
     }
   }
-
-  public static class DelegatedTemperatureControlClusterEventListAttributeCallback implements ChipClusters.TemperatureControlCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRvcRunModeClusterSupportedModesAttributeCallback implements ChipClusters.RvcRunModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7605,9 +7570,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.RvcRunModeClusterModeOptionStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RvcRunModeClusterModeOptionStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -7618,7 +7583,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedTemperatureControlClusterAttributeListAttributeCallback implements ChipClusters.TemperatureControlCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRvcRunModeClusterOnModeAttributeCallback implements ChipClusters.RvcRunModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7626,10 +7591,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);
     }
 
@@ -7639,7 +7604,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAlarmClusterGeneratedCommandListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRvcRunModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcRunModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7660,7 +7625,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAlarmClusterAcceptedCommandListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRvcRunModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcRunModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7681,7 +7646,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAlarmClusterEventListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRvcRunModeClusterEventListAttributeCallback implements ChipClusters.RvcRunModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7702,7 +7667,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRefrigeratorAlarmClusterAttributeListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRvcRunModeClusterAttributeListAttributeCallback implements ChipClusters.RvcRunModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7724,7 +7689,7 @@ public void onError(Exception ex) {
   }
 
 
-  public static class DelegatedDishwasherModeClusterChangeToModeResponseCallback implements ChipClusters.DishwasherModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedRvcCleanModeClusterChangeToModeResponseCallback implements ChipClusters.RvcCleanModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7747,7 +7712,7 @@ public void onError(Exception error) {
       callback.onFailure(error);
     }
   }
-  public static class DelegatedDishwasherModeClusterSupportedModesAttributeCallback implements ChipClusters.DishwasherModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRvcCleanModeClusterSupportedModesAttributeCallback implements ChipClusters.RvcCleanModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7755,9 +7720,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.DishwasherModeClusterModeOptionStruct> valueList) {
+    public void onSuccess(List<ChipStructs.RvcCleanModeClusterModeOptionStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.DishwasherModeClusterModeOptionStruct>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RvcCleanModeClusterModeOptionStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -7768,7 +7733,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherModeClusterStartUpModeAttributeCallback implements ChipClusters.DishwasherModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRvcCleanModeClusterOnModeAttributeCallback implements ChipClusters.RvcCleanModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7789,7 +7754,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherModeClusterOnModeAttributeCallback implements ChipClusters.DishwasherModeCluster.OnModeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRvcCleanModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcCleanModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7797,10 +7762,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);
     }
 
@@ -7810,7 +7775,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.DishwasherModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRvcCleanModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcCleanModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7831,7 +7796,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.DishwasherModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRvcCleanModeClusterEventListAttributeCallback implements ChipClusters.RvcCleanModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7852,7 +7817,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherModeClusterEventListAttributeCallback implements ChipClusters.DishwasherModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRvcCleanModeClusterAttributeListAttributeCallback implements ChipClusters.RvcCleanModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7873,7 +7838,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherModeClusterAttributeListAttributeCallback implements ChipClusters.DishwasherModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedTemperatureControlClusterSupportedTemperatureLevelsAttributeCallback implements ChipClusters.TemperatureControlCluster.SupportedTemperatureLevelsAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7881,9 +7846,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(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);
     }
@@ -7894,7 +7859,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAirQualityClusterGeneratedCommandListAttributeCallback implements ChipClusters.AirQualityCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedTemperatureControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.TemperatureControlCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7915,7 +7880,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAirQualityClusterAcceptedCommandListAttributeCallback implements ChipClusters.AirQualityCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedTemperatureControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.TemperatureControlCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7936,7 +7901,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAirQualityClusterEventListAttributeCallback implements ChipClusters.AirQualityCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedTemperatureControlClusterEventListAttributeCallback implements ChipClusters.TemperatureControlCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7957,7 +7922,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedAirQualityClusterAttributeListAttributeCallback implements ChipClusters.AirQualityCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedTemperatureControlClusterAttributeListAttributeCallback implements ChipClusters.TemperatureControlCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7978,7 +7943,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedSmokeCoAlarmClusterGeneratedCommandListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRefrigeratorAlarmClusterGeneratedCommandListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -7999,7 +7964,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedSmokeCoAlarmClusterAcceptedCommandListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRefrigeratorAlarmClusterAcceptedCommandListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8020,7 +7985,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedSmokeCoAlarmClusterEventListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRefrigeratorAlarmClusterEventListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8041,7 +8006,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedSmokeCoAlarmClusterAttributeListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedRefrigeratorAlarmClusterAttributeListAttributeCallback implements ChipClusters.RefrigeratorAlarmCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8062,7 +8027,8 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherAlarmClusterGeneratedCommandListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+
+  public static class DelegatedDishwasherModeClusterChangeToModeResponseCallback implements ChipClusters.DishwasherModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8070,9 +8036,32 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(Integer status, Optional<String> statusText) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+
+      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);
     }
@@ -8083,7 +8072,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherAlarmClusterAcceptedCommandListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedDishwasherModeClusterStartUpModeAttributeCallback implements ChipClusters.DishwasherModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8091,10 +8080,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);
     }
 
@@ -8104,7 +8093,28 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherAlarmClusterEventListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  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) {
@@ -8125,7 +8135,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedDishwasherAlarmClusterAttributeListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedDishwasherModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.DishwasherModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8146,7 +8156,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedMicrowaveOvenModeClusterSupportedModesAttributeCallback implements ChipClusters.MicrowaveOvenModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedDishwasherModeClusterEventListAttributeCallback implements ChipClusters.DishwasherModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8154,9 +8164,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.MicrowaveOvenModeClusterModeOptionStruct> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.MicrowaveOvenModeClusterModeOptionStruct>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -8167,7 +8177,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedMicrowaveOvenModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.MicrowaveOvenModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedDishwasherModeClusterAttributeListAttributeCallback implements ChipClusters.DishwasherModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8188,7 +8198,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedMicrowaveOvenModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.MicrowaveOvenModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedAirQualityClusterGeneratedCommandListAttributeCallback implements ChipClusters.AirQualityCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8209,7 +8219,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedMicrowaveOvenModeClusterEventListAttributeCallback implements ChipClusters.MicrowaveOvenModeCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedAirQualityClusterAcceptedCommandListAttributeCallback implements ChipClusters.AirQualityCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8230,7 +8240,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedMicrowaveOvenModeClusterAttributeListAttributeCallback implements ChipClusters.MicrowaveOvenModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedAirQualityClusterEventListAttributeCallback implements ChipClusters.AirQualityCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8251,7 +8261,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedMicrowaveOvenControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.MicrowaveOvenControlCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedAirQualityClusterAttributeListAttributeCallback implements ChipClusters.AirQualityCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8272,7 +8282,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedMicrowaveOvenControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.MicrowaveOvenControlCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedSmokeCoAlarmClusterGeneratedCommandListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8293,7 +8303,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedMicrowaveOvenControlClusterEventListAttributeCallback implements ChipClusters.MicrowaveOvenControlCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedSmokeCoAlarmClusterAcceptedCommandListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8314,7 +8324,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedMicrowaveOvenControlClusterAttributeListAttributeCallback implements ChipClusters.MicrowaveOvenControlCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedSmokeCoAlarmClusterEventListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8335,8 +8345,7 @@ public void onError(Exception ex) {
     }
   }
 
-
-  public static class DelegatedOperationalStateClusterOperationalCommandResponseCallback implements ChipClusters.OperationalStateCluster.OperationalCommandResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedSmokeCoAlarmClusterAttributeListAttributeCallback implements ChipClusters.SmokeCoAlarmCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8344,20 +8353,20 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(ChipStructs.OperationalStateClusterErrorStateStruct commandResponseState) {
+    public void onSuccess(List<Long> 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<Long>");
+      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 DelegatedOperationalStateClusterPhaseListAttributeCallback implements ChipClusters.OperationalStateCluster.PhaseListAttributeCallback, DelegatedClusterCallback {
+
+  public static class DelegatedDishwasherAlarmClusterGeneratedCommandListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8365,9 +8374,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(@Nullable 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);
     }
@@ -8378,7 +8387,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalStateClusterCurrentPhaseAttributeCallback implements ChipClusters.OperationalStateCluster.CurrentPhaseAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedDishwasherAlarmClusterAcceptedCommandListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8386,10 +8395,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);
     }
 
@@ -8399,7 +8408,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalStateClusterCountdownTimeAttributeCallback implements ChipClusters.OperationalStateCluster.CountdownTimeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedDishwasherAlarmClusterEventListAttributeCallback implements ChipClusters.DishwasherAlarmCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8407,10 +8416,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);
     }
 
@@ -8420,7 +8429,302 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalStateClusterOperationalStateListAttributeCallback implements ChipClusters.OperationalStateCluster.OperationalStateListAttributeCallback, DelegatedClusterCallback {
+  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) {
@@ -8430,7 +8734,491 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     @Override
     public void onSuccess(List<ChipStructs.OperationalStateClusterOperationalStateStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.OperationalStateClusterOperationalStateStruct>");
+      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) {
+      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 DelegatedHepaFilterMonitoringClusterAcceptedCommandListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.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 DelegatedHepaFilterMonitoringClusterEventListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.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 DelegatedHepaFilterMonitoringClusterAttributeListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.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 DelegatedActivatedCarbonFilterMonitoringClusterLastChangedTimeAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.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 DelegatedActivatedCarbonFilterMonitoringClusterReplacementProductListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.ReplacementProductListAttributeCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(List<ChipStructs.ActivatedCarbonFilterMonitoringClusterReplacementProductStruct> valueList) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ActivatedCarbonFilterMonitoringClusterReplacementProductStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -8441,7 +9229,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalStateClusterOperationalErrorAttributeCallback implements ChipClusters.OperationalStateCluster.OperationalErrorAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedActivatedCarbonFilterMonitoringClusterGeneratedCommandListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8449,10 +9237,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(ChipStructs.OperationalStateClusterErrorStateStruct value) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.OperationalStateClusterErrorStateStruct");
-      responseValues.put(commandResponseInfo, value);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
@@ -8462,7 +9250,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalStateClusterGeneratedCommandListAttributeCallback implements ChipClusters.OperationalStateCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedActivatedCarbonFilterMonitoringClusterAcceptedCommandListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8483,7 +9271,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalStateClusterAcceptedCommandListAttributeCallback implements ChipClusters.OperationalStateCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedActivatedCarbonFilterMonitoringClusterEventListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8504,7 +9292,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalStateClusterEventListAttributeCallback implements ChipClusters.OperationalStateCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedActivatedCarbonFilterMonitoringClusterAttributeListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8525,7 +9313,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedOperationalStateClusterAttributeListAttributeCallback implements ChipClusters.OperationalStateCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedBooleanSensorConfigurationClusterGeneratedCommandListAttributeCallback implements ChipClusters.BooleanSensorConfigurationCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8546,8 +9334,7 @@ public void onError(Exception ex) {
     }
   }
 
-
-  public static class DelegatedRvcOperationalStateClusterOperationalCommandResponseCallback implements ChipClusters.RvcOperationalStateCluster.OperationalCommandResponseCallback, DelegatedClusterCallback {
+  public static class DelegatedBooleanSensorConfigurationClusterAcceptedCommandListAttributeCallback implements ChipClusters.BooleanSensorConfigurationCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8555,20 +9342,20 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(ChipStructs.RvcOperationalStateClusterErrorStateStruct commandResponseState) {
+    public void onSuccess(List<Long> 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<Long>");
+      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 DelegatedBooleanSensorConfigurationClusterEventListAttributeCallback implements ChipClusters.BooleanSensorConfigurationCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8576,9 +9363,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(@Nullable 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);
     }
@@ -8589,7 +9376,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcOperationalStateClusterCurrentPhaseAttributeCallback implements ChipClusters.RvcOperationalStateCluster.CurrentPhaseAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedBooleanSensorConfigurationClusterAttributeListAttributeCallback implements ChipClusters.BooleanSensorConfigurationCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8597,10 +9384,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);
     }
 
@@ -8610,7 +9397,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcOperationalStateClusterCountdownTimeAttributeCallback implements ChipClusters.RvcOperationalStateCluster.CountdownTimeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterOpenDurationAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.OpenDurationAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8631,7 +9418,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcOperationalStateClusterOperationalStateListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.OperationalStateListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterAutoCloseTimeAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.AutoCloseTimeAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8639,10 +9426,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.RvcOperationalStateClusterOperationalStateStruct> valueList) {
+    public void onSuccess(@Nullable Long value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.RvcOperationalStateClusterOperationalStateStruct>");
-      responseValues.put(commandResponseInfo, valueList);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
+      responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
 
@@ -8652,7 +9439,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcOperationalStateClusterOperationalErrorAttributeCallback implements ChipClusters.RvcOperationalStateCluster.OperationalErrorAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterRemainingDurationAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.RemainingDurationAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8660,9 +9447,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(ChipStructs.RvcOperationalStateClusterErrorStateStruct value) {
+    public void onSuccess(@Nullable Long value) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.RvcOperationalStateClusterErrorStateStruct");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
       responseValues.put(commandResponseInfo, value);
       callback.onSuccess(responseValues);
     }
@@ -8673,7 +9460,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcOperationalStateClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterCurrentStateAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.CurrentStateAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8681,10 +9468,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);
     }
 
@@ -8694,7 +9481,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcOperationalStateClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterTargetStateAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.TargetStateAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8702,10 +9489,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);
     }
 
@@ -8715,7 +9502,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcOperationalStateClusterEventListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterCurrentLevelAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.CurrentLevelAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8723,10 +9510,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);
     }
 
@@ -8736,7 +9523,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedRvcOperationalStateClusterAttributeListAttributeCallback implements ChipClusters.RvcOperationalStateCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterTargetLevelAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.TargetLevelAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8744,10 +9531,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);
     }
 
@@ -8757,7 +9544,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedHepaFilterMonitoringClusterLastChangedTimeAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.LastChangedTimeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterOpenLevelAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.OpenLevelAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8765,9 +9552,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);
     }
@@ -8778,7 +9565,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedHepaFilterMonitoringClusterReplacementProductListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.ReplacementProductListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8786,9 +9573,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.HepaFilterMonitoringClusterReplacementProductStruct> valueList) {
+    public void onSuccess(List<Long> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.HepaFilterMonitoringClusterReplacementProductStruct>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -8799,7 +9586,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedHepaFilterMonitoringClusterGeneratedCommandListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8820,7 +9607,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedHepaFilterMonitoringClusterAcceptedCommandListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterEventListAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8841,7 +9628,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedHepaFilterMonitoringClusterEventListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedValveConfigurationAndControlClusterAttributeListAttributeCallback implements ChipClusters.ValveConfigurationAndControlCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8862,7 +9649,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedHepaFilterMonitoringClusterAttributeListAttributeCallback implements ChipClusters.HepaFilterMonitoringCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedDemandResponseLoadControlClusterLoadControlProgramsAttributeCallback implements ChipClusters.DemandResponseLoadControlCluster.LoadControlProgramsAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8870,9 +9657,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<Long> valueList) {
+    public void onSuccess(List<ChipStructs.DemandResponseLoadControlClusterLoadControlProgramStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<Long>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.DemandResponseLoadControlClusterLoadControlProgramStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -8883,7 +9670,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedActivatedCarbonFilterMonitoringClusterLastChangedTimeAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.LastChangedTimeAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedDemandResponseLoadControlClusterEventsAttributeCallback implements ChipClusters.DemandResponseLoadControlCluster.EventsAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8891,10 +9678,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(@Nullable Long value) {
+    public void onSuccess(List<ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Long");
-      responseValues.put(commandResponseInfo, value);
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct>");
+      responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
 
@@ -8904,7 +9691,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedActivatedCarbonFilterMonitoringClusterReplacementProductListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.ReplacementProductListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedDemandResponseLoadControlClusterActiveEventsAttributeCallback implements ChipClusters.DemandResponseLoadControlCluster.ActiveEventsAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8912,9 +9699,9 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(List<ChipStructs.ActivatedCarbonFilterMonitoringClusterReplacementProductStruct> valueList) {
+    public void onSuccess(List<ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct> valueList) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.ActivatedCarbonFilterMonitoringClusterReplacementProductStruct>");
+      CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List<ChipStructs.DemandResponseLoadControlClusterLoadControlEventStruct>");
       responseValues.put(commandResponseInfo, valueList);
       callback.onSuccess(responseValues);
     }
@@ -8925,7 +9712,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedActivatedCarbonFilterMonitoringClusterGeneratedCommandListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedDemandResponseLoadControlClusterGeneratedCommandListAttributeCallback implements ChipClusters.DemandResponseLoadControlCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8946,7 +9733,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedActivatedCarbonFilterMonitoringClusterAcceptedCommandListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedDemandResponseLoadControlClusterAcceptedCommandListAttributeCallback implements ChipClusters.DemandResponseLoadControlCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8967,7 +9754,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedActivatedCarbonFilterMonitoringClusterEventListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.EventListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedDemandResponseLoadControlClusterEventListAttributeCallback implements ChipClusters.DemandResponseLoadControlCluster.EventListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -8988,7 +9775,7 @@ public void onError(Exception ex) {
     }
   }
 
-  public static class DelegatedActivatedCarbonFilterMonitoringClusterAttributeListAttributeCallback implements ChipClusters.ActivatedCarbonFilterMonitoringCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
+  public static class DelegatedDemandResponseLoadControlClusterAttributeListAttributeCallback implements ChipClusters.DemandResponseLoadControlCluster.AttributeListAttributeCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
     @Override
     public void setCallbackDelegate(ClusterCommandCallback callback) {
@@ -17206,6 +17993,14 @@ 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 ovenModeClusterInfo = new ClusterInfo(
+      (ptr, endpointId) -> new ChipClusters.OvenModeCluster(ptr, endpointId), new HashMap<>());
+    clusterMap.put("ovenMode", ovenModeClusterInfo);
+
     ClusterInfo modeSelectClusterInfo = new ClusterInfo(
       (ptr, endpointId) -> new ChipClusters.ModeSelectCluster(ptr, endpointId), new HashMap<>());
     clusterMap.put("modeSelect", modeSelectClusterInfo);
@@ -17278,6 +18073,18 @@ 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 doorLockClusterInfo = new ClusterInfo(
       (ptr, endpointId) -> new ChipClusters.DoorLockCluster(ptr, endpointId), new HashMap<>());
     clusterMap.put("doorLock", doorLockClusterInfo);
@@ -17487,6 +18294,8 @@ 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("ovenMode").combineCommands(source.get("ovenMode"));
     destination.get("modeSelect").combineCommands(source.get("modeSelect"));
     destination.get("laundryWasherMode").combineCommands(source.get("laundryWasherMode"));
     destination.get("refrigeratorAndTemperatureControlledCabinetMode").combineCommands(source.get("refrigeratorAndTemperatureControlledCabinetMode"));
@@ -17505,6 +18314,9 @@ public void combineCommand(Map<String, ClusterInfo> destination, Map<String, Map
     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("doorLock").combineCommands(source.get("doorLock"));
     destination.get("windowCovering").combineCommands(source.get("windowCovering"));
     destination.get("barrierControl").combineCommands(source.get("barrierControl"));
@@ -18974,6 +19786,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)
@@ -18987,6 +19808,15 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
            , (Optional<Long>)
              commandArguments.get("breadcrumb")
 
+           , (Optional<byte[]>)
+             commandArguments.get("networkIdentity")
+
+           , (Optional<byte[]>)
+             commandArguments.get("clientIdentifier")
+
+           , (Optional<byte[]>)
+             commandArguments.get("possessionNonce")
+
             );
         },
         () -> new DelegatedNetworkCommissioningClusterNetworkConfigResponseCallback(),
@@ -19096,6 +19926,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<>();
@@ -19753,6 +20607,95 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
 
     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(),
+        timersetTimerCommandParams
+    );
+    timerClusterInteractionInfoMap.put("setTimer", timersetTimerInteractionInfo);
+
+    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> 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> modeSelectClusterInteractionInfoMap = new LinkedHashMap<>();
 
     Map<String, CommandParameterInfo> modeSelectchangeToModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
@@ -20164,6 +21107,167 @@ 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> 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 1ae23428a8bf50..d5cb920d299b57 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) -> {
@@ -5997,6 +6019,223 @@ 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> 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> readModeSelectInteractionInfo() {
        Map<String, InteractionInfo> result = new LinkedHashMap<>();Map<String, CommandParameterInfo> readModeSelectDescriptionCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readModeSelectDescriptionAttributeInteractionInfo = new InteractionInfo(
@@ -8181,6 +8420,469 @@ 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> readDemandResponseLoadControlDeviceClassCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readDemandResponseLoadControlDeviceClassAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.DemandResponseLoadControlCluster) cluster).readDeviceClassAttribute(
+              (ChipClusters.LongAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
+          readDemandResponseLoadControlDeviceClassCommandParams
+        );
+        result.put("readDeviceClassAttribute", readDemandResponseLoadControlDeviceClassAttributeInteractionInfo);
+     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> readDemandResponseLoadControlNumberOfTransistionsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+        InteractionInfo readDemandResponseLoadControlNumberOfTransistionsAttributeInteractionInfo = new InteractionInfo(
+          (cluster, callback, commandArguments) -> {
+            ((ChipClusters.DemandResponseLoadControlCluster) cluster).readNumberOfTransistionsAttribute(
+              (ChipClusters.IntegerAttributeCallback) callback
+            );
+          },
+          () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
+          readDemandResponseLoadControlNumberOfTransistionsCommandParams
+        );
+        result.put("readNumberOfTransistionsAttribute", readDemandResponseLoadControlNumberOfTransistionsAttributeInteractionInfo);
+     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> readDoorLockInteractionInfo() {
        Map<String, InteractionInfo> result = new LinkedHashMap<>();Map<String, CommandParameterInfo> readDoorLockLockStateCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
         InteractionInfo readDoorLockLockStateAttributeInteractionInfo = new InteractionInfo(
@@ -14002,6 +14704,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) -> {
@@ -17718,6 +18431,8 @@ public Map<String, Map<String, InteractionInfo>> getReadAttributeMap() {
             put("proxyValid", readProxyValidInteractionInfo());
             put("booleanState", readBooleanStateInteractionInfo());
             put("icdManagement", readIcdManagementInteractionInfo());
+            put("timer", readTimerInteractionInfo());
+            put("ovenMode", readOvenModeInteractionInfo());
             put("modeSelect", readModeSelectInteractionInfo());
             put("laundryWasherMode", readLaundryWasherModeInteractionInfo());
             put("refrigeratorAndTemperatureControlledCabinetMode", readRefrigeratorAndTemperatureControlledCabinetModeInteractionInfo());
@@ -17736,6 +18451,9 @@ public Map<String, Map<String, InteractionInfo>> getReadAttributeMap() {
             put("rvcOperationalState", readRvcOperationalStateInteractionInfo());
             put("hepaFilterMonitoring", readHepaFilterMonitoringInteractionInfo());
             put("activatedCarbonFilterMonitoring", readActivatedCarbonFilterMonitoringInteractionInfo());
+            put("booleanSensorConfiguration", readBooleanSensorConfigurationInteractionInfo());
+            put("valveConfigurationAndControl", readValveConfigurationAndControlInteractionInfo());
+            put("demandResponseLoadControl", readDemandResponseLoadControlInteractionInfo());
             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 1e52b8f08c49a0..aaf6fc85bba1d7 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java
+++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java
@@ -724,6 +724,54 @@ 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> 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> writeModeSelectInteractionInfo = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> writeModeSelectStartUpModeCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo modeSelectstartUpModeCommandParameterInfo =
@@ -1090,6 +1138,166 @@ 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> writeDoorLockInteractionInfo = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> writeDoorLockDoorOpenEventsCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
     CommandParameterInfo doorLockdoorOpenEventsCommandParameterInfo =
@@ -3289,28 +3497,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/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/files.gni b/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni
index 85e9c85ce1e2cd..3efc1df1f73f16 100644
--- a/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni
+++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni
@@ -24,6 +24,14 @@ 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",
@@ -53,6 +61,8 @@ 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/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",
@@ -66,6 +76,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",
@@ -95,9 +106,11 @@ 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",
@@ -138,6 +151,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/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/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/BasicInformationCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt
index c1a0a36efd002f..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
@@ -250,6 +250,22 @@ class BasicInformationCluster(
     // Implementation needs to be added here
   }
 
+  suspend fun readSpecificationVersionAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeSpecificationVersionAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readMaxPathsPerInvokeAttribute(): UShort {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeMaxPathsPerInvokeAttribute(minInterval: Int, maxInterval: Int): UShort {
+    // Implementation needs to be added here
+  }
+
   suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
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/ContentLauncherCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt
index 1d866fa4113024..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
@@ -81,17 +81,6 @@ class ContentLauncherCluster(
     // Implementation needs to be added here
   }
 
-  suspend fun writeSupportedStreamingProtocolsAttribute(
-    value: ULong,
-    timedWriteTimeoutMs: Int? = null
-  ) {
-    if (timedWriteTimeoutMs != null) {
-      // Do the action with timedWriteTimeoutMs
-    } else {
-      // Do the action without timedWriteTimeoutMs
-    }
-  }
-
   suspend fun subscribeSupportedStreamingProtocolsAttribute(
     minInterval: Int,
     maxInterval: Int
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..f2e3ce480e1eb4
--- /dev/null
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DemandResponseLoadControlCluster.kt
@@ -0,0 +1,268 @@
+/*
+ *
+ *    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 readDeviceClassAttribute(): UInt {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeDeviceClassAttribute(minInterval: Int, maxInterval: Int): UInt {
+    // Implementation needs to be added here
+  }
+
+  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 readNumberOfTransistionsAttribute(): UByte {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeNumberOfTransistionsAttribute(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/NetworkCommissioningCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt
index 8f0d4adbe40855..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
@@ -34,7 +34,9 @@ class NetworkCommissioningCluster(
   class NetworkConfigResponse(
     val networkingStatus: UInt,
     val debugText: String?,
-    val networkIndex: UByte?
+    val networkIndex: UByte?,
+    val clientIdentity: ByteArray?,
+    val possessionSignature: ByteArray?
   )
 
   class ConnectNetworkResponse(
@@ -43,6 +45,8 @@ class NetworkCommissioningCluster(
     val errorValue: Int?
   )
 
+  class QueryIdentityResponse(val identity: ByteArray, val possessionSignature: ByteArray?)
+
   class NetworksAttribute(val value: List<NetworkCommissioningClusterNetworkInfoStruct>)
 
   class LastNetworkingStatusAttribute(val value: UInt?)
@@ -79,6 +83,9 @@ class NetworkCommissioningCluster(
     ssid: ByteArray,
     credentials: ByteArray,
     breadcrumb: ULong?,
+    networkIdentity: ByteArray?,
+    clientIdentifier: ByteArray?,
+    possessionNonce: ByteArray?,
     timedInvokeTimeoutMs: Int? = null
   ): NetworkConfigResponse {
     val commandId = 2L
@@ -147,6 +154,20 @@ class NetworkCommissioningCluster(
     }
   }
 
+  suspend fun queryIdentity(
+    keyIdentifier: ByteArray,
+    possessionNonce: ByteArray?,
+    timedInvokeTimeoutMs: Int? = null
+  ): QueryIdentityResponse {
+    val commandId = 9L
+
+    if (timedInvokeTimeoutMs != null) {
+      // Do the action with timedInvokeTimeoutMs
+    } else {
+      // Do the action without timedInvokeTimeoutMs
+    }
+  }
+
   suspend fun readMaxNetworksAttribute(): UByte {
     // Implementation needs to be added here
   }
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/ScenesCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt
index 9e5918c4255b88..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
@@ -64,6 +64,8 @@ class ScenesCluster(private val controller: MatterController, private val endpoi
 
   class LastConfiguredByAttribute(val value: ULong?)
 
+  class FabricSceneInfoAttribute(val value: List<ScenesClusterSceneInfoStruct>)
+
   class GeneratedCommandListAttribute(val value: List<UInt>)
 
   class AcceptedCommandListAttribute(val value: List<UInt>)
@@ -279,11 +281,20 @@ class ScenesCluster(private val controller: MatterController, private val endpoi
     // Implementation needs to be added here
   }
 
-  suspend fun readRemainingCapacityAttribute(): UByte {
+  suspend fun readFabricSceneInfoAttribute(): FabricSceneInfoAttribute {
+    // Implementation needs to be added here
+  }
+
+  suspend fun readFabricSceneInfoAttributeWithFabricFilter(
+    isFabricFiltered: Boolean
+  ): FabricSceneInfoAttribute {
     // Implementation needs to be added here
   }
 
-  suspend fun subscribeRemainingCapacityAttribute(minInterval: Int, maxInterval: Int): UByte {
+  suspend fun subscribeFabricSceneInfoAttribute(
+    minInterval: Int,
+    maxInterval: Int
+  ): FabricSceneInfoAttribute {
     // Implementation needs to be added here
   }
 
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/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 1f9d31809288fb..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
@@ -37,6 +37,14 @@ class WakeOnLanCluster(private val controller: MatterController, private val end
     // Implementation needs to be added here
   }
 
+  suspend fun readLinkLocalAddressAttribute(): OctetString {
+    // Implementation needs to be added here
+  }
+
+  suspend fun subscribeLinkLocalAddressAttribute(minInterval: Int, maxInterval: Int): OctetString {
+    // Implementation needs to be added here
+  }
+
   suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
     // Implementation needs to be added here
   }
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/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/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/files.gni b/src/controller/java/generated/java/matter/devicecontroller/cluster/files.gni
index 25bafdf86f1d13..c53547a0049d91 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/files.gni
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/files.gni
@@ -24,6 +24,14 @@ matter_structs_sources = [
   "${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",
@@ -53,6 +61,8 @@ matter_structs_sources = [
   "${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/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",
@@ -66,6 +76,7 @@ matter_structs_sources = [
   "${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",
@@ -95,9 +106,11 @@ matter_eventstructs_sources = [
   "${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",
@@ -138,6 +151,8 @@ matter_eventstructs_sources = [
   "${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",
@@ -158,6 +173,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",
@@ -165,6 +181,7 @@ 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",
@@ -205,6 +222,7 @@ 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/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",
@@ -236,11 +254,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/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..811e87bdc7c429
--- /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: 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/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/NetworkCommissioningClusterNetworkInfoStruct.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt
index 856ed9943059b0..245061cc19fc46 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt
+++ b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt
@@ -16,6 +16,7 @@
  */
 package matter.devicecontroller.cluster.structs
 
+import java.util.Optional
 import matter.devicecontroller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
@@ -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/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/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/src/chip/devicecontroller/ChipDeviceController.java b/src/controller/java/src/chip/devicecontroller/ChipDeviceController.java
index 95f65741bb4ca1..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;
@@ -671,6 +672,7 @@ public void subscribeToAttributePath(
         devicePtr,
         attributePaths,
         null,
+        null,
         minInterval,
         maxInterval,
         false,
@@ -708,6 +710,7 @@ public void subscribeToEventPath(
         devicePtr,
         null,
         eventPaths,
+        null,
         minInterval,
         maxInterval,
         false,
@@ -733,6 +736,7 @@ public void subscribeToEventPath(
         devicePtr,
         null,
         eventPaths,
+        null,
         minInterval,
         maxInterval,
         false,
@@ -744,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
@@ -753,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
@@ -768,6 +807,7 @@ public void subscribeToPath(
       long devicePtr,
       List<ChipAttributePath> attributePaths,
       List<ChipEventPath> eventPaths,
+      List<DataVersionFilter> dataVersionFilters,
       int minInterval,
       int maxInterval,
       boolean keepSubscriptions,
@@ -782,6 +822,7 @@ public void subscribeToPath(
         devicePtr,
         attributePaths,
         eventPaths,
+        dataVersionFilters,
         minInterval,
         maxInterval,
         keepSubscriptions,
@@ -812,6 +853,7 @@ public void subscribeToPath(
         devicePtr,
         attributePaths,
         eventPaths,
+        null,
         minInterval,
         maxInterval,
         keepSubscriptions,
@@ -841,6 +883,7 @@ public void readAttributePath(
         devicePtr,
         attributePaths,
         null,
+        null,
         true,
         imTimeoutMs,
         null);
@@ -864,6 +907,7 @@ public void readEventPath(
         devicePtr,
         null,
         eventPaths,
+        null,
         true,
         imTimeoutMs,
         null);
@@ -883,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.
    */
@@ -903,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);
@@ -912,6 +980,7 @@ public void readPath(
         devicePtr,
         attributePaths,
         eventPaths,
+        dataVersionFilters,
         isFabricFiltered,
         imTimeoutMs,
         null);
@@ -933,6 +1002,7 @@ public void readPath(
         devicePtr,
         attributePaths,
         eventPaths,
+        null,
         isFabricFiltered,
         imTimeoutMs,
         eventMin);
@@ -1119,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,
@@ -1132,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,
@@ -1150,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,
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/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/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
index cb1fbe18f13f26..8b170677a47186 100644
--- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
@@ -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;
@@ -12647,24 +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;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
-            {
-                return nullptr;
-            }
-            jobject value;
-            LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue, value));
-            return value;
-        }
-        case Attributes::StandardNamespace::Id: {
-            using TypeInfo = Attributes::StandardNamespace::TypeInfo;
+        case Attributes::SetTime::Id: {
+            using TypeInfo = Attributes::SetTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12672,22 +12809,15 @@ 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);
-            }
+            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::SupportedModes::Id: {
-            using TypeInfo = Attributes::SupportedModes::TypeInfo;
+        case Attributes::TimeRemaining::Id: {
+            using TypeInfo = Attributes::TimeRemaining::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12695,91 +12825,15 @@ 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())
-            {
-                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);
-                chip::JniReferences::GetInstance().AddToList(value, newElement_0);
-            }
+            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::CurrentMode::Id: {
-            using TypeInfo = Attributes::CurrentMode::TypeInfo;
+        case Attributes::TimerState::Id: {
+            using TypeInfo = Attributes::TimerState::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -12794,52 +12848,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;
-            *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;
@@ -12978,8 +12986,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::LaundryWasherMode::Id: {
-        using namespace app::Clusters::LaundryWasherMode;
+    case app::Clusters::OvenMode::Id: {
+        using namespace app::Clusters::OvenMode;
         switch (aPath.mAttributeId)
         {
         case Attributes::SupportedModes::Id: {
@@ -13042,17 +13050,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
 
                     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 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");
+                        ChipLogError(Zcl, "Could not find ChipStructs$OvenModeClusterModeTagStruct constructor");
                         return nullptr;
                     }
 
@@ -13063,18 +13071,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
 
                 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 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$LaundryWasherModeClusterModeOptionStruct constructor");
+                    ChipLogError(Zcl, "Could not find ChipStructs$OvenModeClusterModeOptionStruct constructor");
                     return nullptr;
                 }
 
@@ -13284,10 +13291,45 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id: {
-        using namespace app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode;
+    case app::Clusters::ModeSelect::Id: {
+        using namespace app::Clusters::ModeSelect;
         switch (aPath.mAttributeId)
         {
+        case Attributes::Description::Id: {
+            using TypeInfo = Attributes::Description::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
+            {
+                return nullptr;
+            }
+            jobject value;
+            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)
+            {
+                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;
@@ -13313,31 +13355,21 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 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);
+                jobject newElement_0_semanticTags;
+                chip::JniReferences::GetInstance().CreateArrayList(newElement_0_semanticTags);
 
-                auto iter_newElement_0_modeTags_2 = entry_0.modeTags.begin();
-                while (iter_newElement_0_modeTags_2.Next())
+                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";
@@ -13346,56 +13378,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$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct",
-                        modeTagStructStructClass_3);
+                        env, "chip/devicecontroller/ChipStructs$ModeSelectClusterSemanticTagStruct",
+                        semanticTagStructStructClass_3);
                     if (err != CHIP_NO_ERROR)
                     {
-                        ChipLogError(
-                            Zcl,
-                            "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct");
+                        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$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct 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$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct",
-                    modeOptionStructStructClass_1);
+                    env, "chip/devicecontroller/ChipStructs$ModeSelectClusterModeOptionStruct", modeOptionStructStructClass_1);
                 if (err != CHIP_NO_ERROR)
                 {
-                    ChipLogError(
-                        Zcl,
-                        "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct");
+                    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$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct 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;
@@ -13600,12 +13622,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::LaundryWasherControls::Id: {
-        using namespace app::Clusters::LaundryWasherControls;
+    case app::Clusters::LaundryWasherMode::Id: {
+        using namespace app::Clusters::LaundryWasherMode;
         switch (aPath.mAttributeId)
         {
-        case Attributes::SpinSpeeds::Id: {
-            using TypeInfo = Attributes::SpinSpeeds::TypeInfo;
+        case Attributes::SupportedModes::Id: {
+            using TypeInfo = Attributes::SupportedModes::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13620,13 +13642,110 @@ 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));
+                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);
+                }
+
+                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)
+                {
+                    ChipLogError(Zcl, "Could not find ChipStructs$LaundryWasherModeClusterModeOptionStruct 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::SpinSpeedCurrent::Id: {
-            using TypeInfo = Attributes::SpinSpeedCurrent::TypeInfo;
+        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)
@@ -13648,8 +13767,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             return value;
         }
-        case Attributes::NumberOfRinses::Id: {
-            using TypeInfo = Attributes::NumberOfRinses::TypeInfo;
+        case Attributes::OnMode::Id: {
+            using TypeInfo = Attributes::OnMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13657,40 +13776,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::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;
+        case Attributes::GeneratedCommandList::Id: {
+            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -13827,8 +13928,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::RvcRunMode::Id: {
-        using namespace app::Clusters::RvcRunMode;
+    case app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id: {
+        using namespace app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode;
         switch (aPath.mAttributeId)
         {
         case Attributes::SupportedModes::Id: {
@@ -13891,17 +13992,23 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
 
                     jclass modeTagStructStructClass_3;
                     err = chip::JniReferences::GetInstance().GetClassRef(
-                        env, "chip/devicecontroller/ChipStructs$RvcRunModeClusterModeTagStruct", modeTagStructStructClass_3);
+                        env,
+                        "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct",
+                        modeTagStructStructClass_3);
                     if (err != CHIP_NO_ERROR)
                     {
-                        ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeClusterModeTagStruct");
+                        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$RvcRunModeClusterModeTagStruct constructor");
+                        ChipLogError(Zcl,
+                                     "Could not find "
+                                     "ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct constructor");
                         return nullptr;
                     }
 
@@ -13912,17 +14019,22 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
 
                 jclass modeOptionStructStructClass_1;
                 err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$RvcRunModeClusterModeOptionStruct", modeOptionStructStructClass_1);
+                    env, "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct",
+                    modeOptionStructStructClass_1);
                 if (err != CHIP_NO_ERROR)
                 {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeClusterModeOptionStruct");
+                    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$RvcRunModeClusterModeOptionStruct constructor");
+                    ChipLogError(Zcl,
+                                 "Could not find "
+                                 "ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct constructor");
                     return nullptr;
                 }
 
@@ -13948,6 +14060,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;
@@ -14109,12 +14244,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::RvcCleanMode::Id: {
-        using namespace app::Clusters::RvcCleanMode;
+    case app::Clusters::LaundryWasherControls::Id: {
+        using namespace app::Clusters::LaundryWasherControls;
         switch (aPath.mAttributeId)
         {
-        case Attributes::SupportedModes::Id: {
-            using TypeInfo = Attributes::SupportedModes::TypeInfo;
+        case Attributes::SpinSpeeds::Id: {
+            using TypeInfo = Attributes::SpinSpeeds::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14129,93 +14264,36 @@ 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_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);
+                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0, newElement_0));
                 chip::JniReferences::GetInstance().AddToList(value, newElement_0);
             }
             return value;
         }
-        case Attributes::CurrentMode::Id: {
-            using TypeInfo = Attributes::CurrentMode::TypeInfo;
+        case Attributes::SpinSpeedCurrent::Id: {
+            using TypeInfo = Attributes::SpinSpeedCurrent::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::NumberOfRinses::Id: {
+            using TypeInfo = Attributes::NumberOfRinses::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14230,8 +14308,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::OnMode::Id: {
-            using TypeInfo = Attributes::OnMode::TypeInfo;
+        case Attributes::SupportedRinses::Id: {
+            using TypeInfo = Attributes::SupportedRinses::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14239,17 +14317,19 @@ 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())
             {
-                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);
+                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;
         }
@@ -14391,28 +14471,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::TemperatureControl::Id: {
-        using namespace app::Clusters::TemperatureControl;
+    case app::Clusters::RvcRunMode::Id: {
+        using namespace app::Clusters::RvcRunMode;
         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;
+        case Attributes::SupportedModes::Id: {
+            using TypeInfo = Attributes::SupportedModes::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14420,31 +14484,100 @@ 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);
-            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)
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                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);
+                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$RvcRunModeClusterModeTagStruct", modeTagStructStructClass_3);
+                    if (err != CHIP_NO_ERROR)
+                    {
+                        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$RvcRunModeClusterModeTagStruct 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$RvcRunModeClusterModeOptionStruct", modeOptionStructStructClass_1);
+                if (err != CHIP_NO_ERROR)
+                {
+                    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$RvcRunModeClusterModeOptionStruct 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::Step::Id: {
-            using TypeInfo = Attributes::Step::TypeInfo;
+        case Attributes::CurrentMode::Id: {
+            using TypeInfo = Attributes::CurrentMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14459,8 +14592,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::SelectedTemperatureLevel::Id: {
-            using TypeInfo = Attributes::SelectedTemperatureLevel::TypeInfo;
+        case Attributes::OnMode::Id: {
+            using TypeInfo = Attributes::OnMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14468,31 +14601,17 @@ 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);
-            return value;
-        }
-        case Attributes::SupportedTemperatureLevels::Id: {
-            using TypeInfo = Attributes::SupportedTemperatureLevels::TypeInfo;
-            TypeInfo::DecodableType cppValue;
-            *aError = app::DataModel::Decode(aReader, cppValue);
-            if (*aError != CHIP_NO_ERROR)
+            if (cppValue.IsNull())
             {
-                return nullptr;
+                value = nullptr;
             }
-            jobject value;
-            chip::JniReferences::GetInstance().CreateArrayList(value);
-
-            auto iter_value_0 = cppValue.begin();
-            while (iter_value_0.Next())
+            else
             {
-                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);
+                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;
         }
@@ -14634,12 +14753,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::RefrigeratorAlarm::Id: {
-        using namespace app::Clusters::RefrigeratorAlarm;
+    case app::Clusters::RvcCleanMode::Id: {
+        using namespace app::Clusters::RvcCleanMode;
         switch (aPath.mAttributeId)
         {
-        case Attributes::Mask::Id: {
-            using TypeInfo = Attributes::Mask::TypeInfo;
+        case Attributes::SupportedModes::Id: {
+            using TypeInfo = Attributes::SupportedModes::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14647,15 +14766,100 @@ 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;
+                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::State::Id: {
-            using TypeInfo = Attributes::State::TypeInfo;
+        case Attributes::CurrentMode::Id: {
+            using TypeInfo = Attributes::CurrentMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14663,15 +14867,15 @@ 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::Supported::Id: {
-            using TypeInfo = Attributes::Supported::TypeInfo;
+        case Attributes::OnMode::Id: {
+            using TypeInfo = Attributes::OnMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14679,13 +14883,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);
-            return 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;
@@ -14824,12 +15035,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::DishwasherMode::Id: {
-        using namespace app::Clusters::DishwasherMode;
+    case app::Clusters::TemperatureControl::Id: {
+        using namespace app::Clusters::TemperatureControl;
         switch (aPath.mAttributeId)
         {
-        case Attributes::SupportedModes::Id: {
-            using TypeInfo = Attributes::SupportedModes::TypeInfo;
+        case Attributes::TemperatureSetpoint::Id: {
+            using TypeInfo = Attributes::TemperatureSetpoint::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14837,100 +15048,15 @@ 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())
-            {
-                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$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);
-            }
+            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::CurrentMode::Id: {
-            using TypeInfo = Attributes::CurrentMode::TypeInfo;
+        case Attributes::MinTemperature::Id: {
+            using TypeInfo = Attributes::MinTemperature::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14945,8 +15071,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::StartUpMode::Id: {
-            using TypeInfo = Attributes::StartUpMode::TypeInfo;
+        case Attributes::MaxTemperature::Id: {
+            using TypeInfo = Attributes::MaxTemperature::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14954,22 +15080,31 @@ 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);
+            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)
             {
-                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::OnMode::Id: {
-            using TypeInfo = Attributes::OnMode::TypeInfo;
+        case Attributes::SelectedTemperatureLevel::Id: {
+            using TypeInfo = Attributes::SelectedTemperatureLevel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -14977,17 +15112,31 @@ 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::SupportedTemperatureLevels::Id: {
+            using TypeInfo = Attributes::SupportedTemperatureLevels::TypeInfo;
+            TypeInfo::DecodableType cppValue;
+            *aError = app::DataModel::Decode(aReader, cppValue);
+            if (*aError != CHIP_NO_ERROR)
             {
-                value = nullptr;
+                return nullptr;
             }
-            else
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
+
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                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);
+                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;
         }
@@ -15129,12 +15278,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::AirQuality::Id: {
-        using namespace app::Clusters::AirQuality;
+    case app::Clusters::RefrigeratorAlarm::Id: {
+        using namespace app::Clusters::RefrigeratorAlarm;
         switch (aPath.mAttributeId)
         {
-        case Attributes::AirQuality::Id: {
-            using TypeInfo = Attributes::AirQuality::TypeInfo;
+        case Attributes::Mask::Id: {
+            using TypeInfo = Attributes::Mask::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15142,11 +15291,43 @@ 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);
+            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: {
@@ -15287,12 +15468,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::SmokeCoAlarm::Id: {
-        using namespace app::Clusters::SmokeCoAlarm;
+    case app::Clusters::DishwasherMode::Id: {
+        using namespace app::Clusters::DishwasherMode;
         switch (aPath.mAttributeId)
         {
-        case Attributes::ExpressedState::Id: {
-            using TypeInfo = Attributes::ExpressedState::TypeInfo;
+        case Attributes::SupportedModes::Id: {
+            using TypeInfo = Attributes::SupportedModes::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15300,47 +15481,100 @@ 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);
-            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)
-            {
-                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::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_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                return nullptr;
+                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$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);
             }
-            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::BatteryAlert::Id: {
-            using TypeInfo = Attributes::BatteryAlert::TypeInfo;
+        case Attributes::CurrentMode::Id: {
+            using TypeInfo = Attributes::CurrentMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15355,8 +15589,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::DeviceMuted::Id: {
-            using TypeInfo = Attributes::DeviceMuted::TypeInfo;
+        case Attributes::StartUpMode::Id: {
+            using TypeInfo = Attributes::StartUpMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15364,95 +15598,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);
-            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)
+            if (cppValue.IsNull())
             {
-                return nullptr;
+                value = 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)
+            else
             {
-                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(),
+                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::EndOfServiceAlert::Id: {
-            using TypeInfo = Attributes::EndOfServiceAlert::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::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;
+        case Attributes::OnMode::Id: {
+            using TypeInfo = Attributes::OnMode::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15460,43 +15621,18 @@ 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);
-            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)
+            if (cppValue.IsNull())
             {
-                return nullptr;
+                value = 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)
+            else
             {
-                return nullptr;
+                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);
             }
-            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: {
@@ -15637,60 +15773,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::DishwasherAlarm::Id: {
-        using namespace app::Clusters::DishwasherAlarm;
-        switch (aPath.mAttributeId)
+    case app::Clusters::AirQuality::Id: {
+        using namespace app::Clusters::AirQuality;
+        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;
+        case Attributes::AirQuality::Id: {
+            using TypeInfo = Attributes::AirQuality::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15698,11 +15786,11 @@ 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::GeneratedCommandList::Id: {
@@ -15843,12 +15931,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::MicrowaveOvenMode::Id: {
-        using namespace app::Clusters::MicrowaveOvenMode;
+    case app::Clusters::SmokeCoAlarm::Id: {
+        using namespace app::Clusters::SmokeCoAlarm;
         switch (aPath.mAttributeId)
         {
-        case Attributes::SupportedModes::Id: {
-            using TypeInfo = Attributes::SupportedModes::TypeInfo;
+        case Attributes::ExpressedState::Id: {
+            using TypeInfo = Attributes::ExpressedState::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15856,101 +15944,15 @@ 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())
-            {
-                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);
-            }
+            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::CurrentMode::Id: {
-            using TypeInfo = Attributes::CurrentMode::TypeInfo;
+        case Attributes::SmokeState::Id: {
+            using TypeInfo = Attributes::SmokeState::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15965,8 +15967,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::GeneratedCommandList::Id: {
-            using TypeInfo = Attributes::GeneratedCommandList::TypeInfo;
+        case Attributes::COState::Id: {
+            using TypeInfo = Attributes::COState::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15974,24 +15976,15 @@ 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())
-            {
-                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);
-            }
+            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::AcceptedCommandList::Id: {
-            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
+        case Attributes::BatteryAlert::Id: {
+            using TypeInfo = Attributes::BatteryAlert::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -15999,24 +15992,15 @@ 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())
-            {
-                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);
-            }
+            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::DeviceMuted::Id: {
+            using TypeInfo = Attributes::DeviceMuted::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16024,24 +16008,15 @@ 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())
-            {
-                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);
-            }
+            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::AttributeList::Id: {
-            using TypeInfo = Attributes::AttributeList::TypeInfo;
+        case Attributes::TestInProgress::Id: {
+            using TypeInfo = Attributes::TestInProgress::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16049,24 +16024,15 @@ 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())
-            {
-                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);
-            }
+            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::FeatureMap::Id: {
-            using TypeInfo = Attributes::FeatureMap::TypeInfo;
+        case Attributes::HardwareFaultAlert::Id: {
+            using TypeInfo = Attributes::HardwareFaultAlert::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16074,15 +16040,15 @@ 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);
+            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::ClusterRevision::Id: {
-            using TypeInfo = Attributes::ClusterRevision::TypeInfo;
+        case Attributes::EndOfServiceAlert::Id: {
+            using TypeInfo = Attributes::EndOfServiceAlert::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16097,18 +16063,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        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;
+        case Attributes::InterconnectSmokeAlarm::Id: {
+            using TypeInfo = Attributes::InterconnectSmokeAlarm::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16116,15 +16072,15 @@ 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);
+            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::PowerSetting::Id: {
-            using TypeInfo = Attributes::PowerSetting::TypeInfo;
+        case Attributes::InterconnectCOAlarm::Id: {
+            using TypeInfo = Attributes::InterconnectCOAlarm::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16139,8 +16095,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::MinPower::Id: {
-            using TypeInfo = Attributes::MinPower::TypeInfo;
+        case Attributes::ContaminationState::Id: {
+            using TypeInfo = Attributes::ContaminationState::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16155,8 +16111,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::MaxPower::Id: {
-            using TypeInfo = Attributes::MaxPower::TypeInfo;
+        case Attributes::SmokeSensitivityLevel::Id: {
+            using TypeInfo = Attributes::SmokeSensitivityLevel::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16171,8 +16127,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::PowerStep::Id: {
-            using TypeInfo = Attributes::PowerStep::TypeInfo;
+        case Attributes::ExpiryDate::Id: {
+            using TypeInfo = Attributes::ExpiryDate::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16180,11 +16136,11 @@ 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);
+            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: {
@@ -16325,12 +16281,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::OperationalState::Id: {
-        using namespace app::Clusters::OperationalState;
+    case app::Clusters::DishwasherAlarm::Id: {
+        using namespace app::Clusters::DishwasherAlarm;
         switch (aPath.mAttributeId)
         {
-        case Attributes::PhaseList::Id: {
-            using TypeInfo = Attributes::PhaseList::TypeInfo;
+        case Attributes::Mask::Id: {
+            using TypeInfo = Attributes::Mask::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16338,27 +16294,15 @@ 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_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);
-                }
-            }
+            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::CurrentPhase::Id: {
-            using TypeInfo = Attributes::CurrentPhase::TypeInfo;
+        case Attributes::Latch::Id: {
+            using TypeInfo = Attributes::Latch::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16366,22 +16310,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.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)
             {
-                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/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::CountdownTime::Id: {
-            using TypeInfo = Attributes::CountdownTime::TypeInfo;
+        case Attributes::Supported::Id: {
+            using TypeInfo = Attributes::Supported::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16389,22 +16342,40 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                 return nullptr;
             }
             jobject value;
-            if (cppValue.IsNull())
+            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)
             {
-                value = nullptr;
+                return nullptr;
             }
-            else
+            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.Value());
-                chip::JniReferences::GetInstance().CreateBoxedObject<jlong>(valueClassName.c_str(), valueCtorSignature.c_str(),
-                                                                            jnivalue, value);
+                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::OperationalStateList::Id: {
-            using TypeInfo = Attributes::OperationalStateList::TypeInfo;
+        case Attributes::AcceptedCommandList::Id: {
+            using TypeInfo = Attributes::AcceptedCommandList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16419,52 +16390,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::EventList::Id: {
+            using TypeInfo = Attributes::EventList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16472,15 +16408,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::AttributeList::Id: {
+            using TypeInfo = Attributes::AttributeList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16488,56 +16433,180 @@ 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::FeatureMap::Id: {
+            using TypeInfo = Attributes::FeatureMap::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;
+            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)
             {
-                chip::JniReferences::GetInstance().CreateOptional(nullptr, value_errorStateDetails);
+                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;
+        }
+        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)
             {
-                jobject value_errorStateDetailsInsideOptional;
-                LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue.errorStateDetails.Value(),
-                                                                                     value_errorStateDetailsInsideOptional));
-                chip::JniReferences::GetInstance().CreateOptional(value_errorStateDetailsInsideOptional, value_errorStateDetails);
+                return nullptr;
             }
+            jobject value;
+            chip::JniReferences::GetInstance().CreateArrayList(value);
 
-            jclass errorStateStructStructClass_0;
-            err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$OperationalStateClusterErrorStateStruct", errorStateStructStructClass_0);
-            if (err != CHIP_NO_ERROR)
+            auto iter_value_0 = cppValue.begin();
+            while (iter_value_0.Next())
             {
-                ChipLogError(Zcl, "Could not find class ChipStructs$OperationalStateClusterErrorStateStruct");
-                return nullptr;
+                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);
             }
-            jmethodID errorStateStructStructCtor_0 = env->GetMethodID(
-                errorStateStructStructClass_0, "<init>", "(Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;)V");
-            if (errorStateStructStructCtor_0 == nullptr)
+            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)
             {
-                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: {
@@ -16678,12 +16747,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::RvcOperationalState::Id: {
-        using namespace app::Clusters::RvcOperationalState;
+    case app::Clusters::MicrowaveOvenControl::Id: {
+        using namespace app::Clusters::MicrowaveOvenControl;
         switch (aPath.mAttributeId)
         {
-        case Attributes::PhaseList::Id: {
-            using TypeInfo = Attributes::PhaseList::TypeInfo;
+        case Attributes::CookTime::Id: {
+            using TypeInfo = Attributes::CookTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16691,27 +16760,15 @@ 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_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);
-                }
-            }
+            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::CurrentPhase::Id: {
-            using TypeInfo = Attributes::CurrentPhase::TypeInfo;
+        case Attributes::PowerSetting::Id: {
+            using TypeInfo = Attributes::PowerSetting::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16719,22 +16776,15 @@ 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);
-            }
+            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::CountdownTime::Id: {
-            using TypeInfo = Attributes::CountdownTime::TypeInfo;
+        case Attributes::MinPower::Id: {
+            using TypeInfo = Attributes::MinPower::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16742,82 +16792,15 @@ 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.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);
-            }
+            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::OperationalState::Id: {
-            using TypeInfo = Attributes::OperationalState::TypeInfo;
+        case Attributes::MaxPower::Id: {
+            using TypeInfo = Attributes::MaxPower::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16832,8 +16815,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::OperationalError::Id: {
-            using TypeInfo = Attributes::OperationalError::TypeInfo;
+        case Attributes::PowerStep::Id: {
+            using TypeInfo = Attributes::PowerStep::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -16841,56 +16824,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: {
@@ -17031,12 +16969,12 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
         }
         break;
     }
-    case app::Clusters::HepaFilterMonitoring::Id: {
-        using namespace app::Clusters::HepaFilterMonitoring;
+    case app::Clusters::OperationalState::Id: {
+        using namespace app::Clusters::OperationalState;
         switch (aPath.mAttributeId)
         {
-        case Attributes::Condition::Id: {
-            using TypeInfo = Attributes::Condition::TypeInfo;
+        case Attributes::PhaseList::Id: {
+            using TypeInfo = Attributes::PhaseList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17044,47 +16982,27 @@ 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);
-            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)
+            if (cppValue.IsNull())
             {
-                return nullptr;
+                value = 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)
+            else
             {
-                return nullptr;
+                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);
+                }
             }
-            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;
+        case Attributes::CurrentPhase::Id: {
+            using TypeInfo = Attributes::CurrentPhase::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17092,15 +17010,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(),
+            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::LastChangedTime::Id: {
-            using TypeInfo = Attributes::LastChangedTime::TypeInfo;
+        case Attributes::CountdownTime::Id: {
+            using TypeInfo = Attributes::CountdownTime::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17122,8 +17047,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             }
             return value;
         }
-        case Attributes::ReplacementProductList::Id: {
-            using TypeInfo = Attributes::ReplacementProductList::TypeInfo;
+        case Attributes::OperationalStateList::Id: {
+            using TypeInfo = Attributes::OperationalStateList::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17138,158 +17063,2926 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
             {
                 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);
+                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_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));
+                    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::DeviceClass::Id: {
+            using TypeInfo = Attributes::DeviceClass::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::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;
+                    }
 
-                jclass replacementProductStructStructClass_1;
+                    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$HepaFilterMonitoringClusterReplacementProductStruct",
-                    replacementProductStructStructClass_1);
+                    env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterLoadControlEventStruct",
+                    loadControlEventStructStructClass_1);
                 if (err != CHIP_NO_ERROR)
                 {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$HepaFilterMonitoringClusterReplacementProductStruct");
+                    ChipLogError(Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterLoadControlEventStruct");
                     return nullptr;
                 }
-                jmethodID replacementProductStructStructCtor_1 =
-                    env->GetMethodID(replacementProductStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/lang/String;)V");
-                if (replacementProductStructStructCtor_1 == 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$HepaFilterMonitoringClusterReplacementProductStruct constructor");
+                    ChipLogError(Zcl,
+                                 "Could not find ChipStructs$DemandResponseLoadControlClusterLoadControlEventStruct 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);
+                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::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;
+        case Attributes::NumberOfEventsPerProgram::Id: {
+            using TypeInfo = Attributes::NumberOfEventsPerProgram::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17304,18 +19997,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        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::NumberOfTransistions::Id: {
+            using TypeInfo = Attributes::NumberOfTransistions::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17330,8 +20013,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::DegradationDirection::Id: {
-            using TypeInfo = Attributes::DegradationDirection::TypeInfo;
+        case Attributes::DefaultRandomStart::Id: {
+            using TypeInfo = Attributes::DefaultRandomStart::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17346,8 +20029,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        value);
             return value;
         }
-        case Attributes::ChangeIndication::Id: {
-            using TypeInfo = Attributes::ChangeIndication::TypeInfo;
+        case Attributes::DefaultRandomDuration::Id: {
+            using TypeInfo = Attributes::DefaultRandomDuration::TypeInfo;
             TypeInfo::DecodableType cppValue;
             *aError = app::DataModel::Decode(aReader, cppValue);
             if (*aError != CHIP_NO_ERROR)
@@ -17362,98 +20045,6 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                                                        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;
@@ -27928,6 +30519,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;
@@ -29527,7 +32133,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 91c8fba3749aa7..64ece3857a36fb 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,
@@ -471,6 +474,25 @@ 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 (*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 (*ModeSelectSupportedModesListAttributeCallback)(
     void * context,
     const chip::app::DataModel::DecodableList<chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType> & data);
@@ -667,6 +689,42 @@ 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 (*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 77703a5afb7059..f4783540b51d53 100644
--- a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
+++ b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
@@ -2222,27 +2222,561 @@ 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, ModeSelectCluster, writeStartUpModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     ListFreer listFreer;
-    using TypeInfo = chip::app::Clusters::ModeSelect::Attributes::StartUpMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ModeSelect::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;
+    ModeSelectCluster * cppCluster = reinterpret_cast<ModeSelectCluster *>(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, writeOnModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
+{
+    chip::DeviceLayer::StackLock lock;
+    ListFreer listFreer;
+    using TypeInfo = chip::app::Clusters::ModeSelect::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;
+    ModeSelectCluster * cppCluster = reinterpret_cast<ModeSelectCluster *>(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, LaundryWasherModeCluster, writeStartUpModeAttribute)
+(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::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;
+    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, 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;
 
-    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>);
@@ -2256,8 +2790,8 @@ JNI_METHOD(void, ModeSelectCluster, writeStartUpModeAttribute)
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
-    ModeSelectCluster * cppCluster = reinterpret_cast<ModeSelectCluster *>(clusterPtr);
+    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));
@@ -2282,12 +2816,12 @@ JNI_METHOD(void, ModeSelectCluster, writeStartUpModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ModeSelectCluster, writeOnModeAttribute)
+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::ModeSelect::Attributes::OnMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::RvcRunMode::Attributes::OnMode::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -2317,7 +2851,7 @@ JNI_METHOD(void, ModeSelectCluster, writeOnModeAttribute)
                        env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err                 = CHIP_NO_ERROR;
-    ModeSelectCluster * cppCluster = reinterpret_cast<ModeSelectCluster *>(clusterPtr);
+    RvcRunModeCluster * cppCluster = reinterpret_cast<RvcRunModeCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2342,12 +2876,12 @@ JNI_METHOD(void, ModeSelectCluster, writeOnModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, LaundryWasherModeCluster, writeStartUpModeAttribute)
+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::LaundryWasherMode::Attributes::StartUpMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::RvcCleanMode::Attributes::OnMode::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -2376,8 +2910,8 @@ JNI_METHOD(void, LaundryWasherModeCluster, writeStartUpModeAttribute)
                    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;
+    RvcCleanModeCluster * cppCluster = reinterpret_cast<RvcCleanModeCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2402,12 +2936,12 @@ JNI_METHOD(void, LaundryWasherModeCluster, writeStartUpModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, LaundryWasherModeCluster, writeOnModeAttribute)
+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::LaundryWasherMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::DishwasherMode::Attributes::StartUpMode::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -2436,8 +2970,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;
+    DishwasherModeCluster * cppCluster = reinterpret_cast<DishwasherModeCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2462,12 +2996,12 @@ JNI_METHOD(void, LaundryWasherModeCluster, writeOnModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeCluster, writeStartUpModeAttribute)
+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::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::DishwasherMode::Attributes::OnMode::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -2496,9 +3030,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;
+    DishwasherModeCluster * cppCluster = reinterpret_cast<DishwasherModeCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2523,27 +3056,19 @@ JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeCluster, writeSt
     onFailure.release();
 }
 
-JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeCluster, writeOnModeAttribute)
+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::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::SmokeCoAlarm::Attributes::SmokeSensitivityLevel::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 +3082,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;
+    SmokeCoAlarmCluster * cppCluster = reinterpret_cast<SmokeCoAlarmCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2584,12 +3108,12 @@ JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeCluster, writeOn
     onFailure.release();
 }
 
-JNI_METHOD(void, LaundryWasherControlsCluster, writeSpinSpeedCurrentAttribute)
+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::LaundryWasherControls::Attributes::SpinSpeedCurrent::TypeInfo;
+    using TypeInfo = chip::app::Clusters::HepaFilterMonitoring::Attributes::LastChangedTime::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -2603,7 +3127,7 @@ JNI_METHOD(void, LaundryWasherControlsCluster, writeSpinSpeedCurrentAttribute)
     {
         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(
@@ -2618,8 +3142,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;
+    HepaFilterMonitoringCluster * cppCluster = reinterpret_cast<HepaFilterMonitoringCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2644,19 +3168,27 @@ JNI_METHOD(void, LaundryWasherControlsCluster, writeSpinSpeedCurrentAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, LaundryWasherControlsCluster, writeNumberOfRinsesAttribute)
+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::LaundryWasherControls::Attributes::NumberOfRinses::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::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 +3202,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;
+    ActivatedCarbonFilterMonitoringCluster * cppCluster = reinterpret_cast<ActivatedCarbonFilterMonitoringCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2696,27 +3228,19 @@ JNI_METHOD(void, LaundryWasherControlsCluster, writeNumberOfRinsesAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, RvcRunModeCluster, 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::RvcRunMode::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>);
@@ -2730,8 +3254,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;
+    BooleanSensorConfigurationCluster * cppCluster = reinterpret_cast<BooleanSensorConfigurationCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2756,27 +3280,19 @@ JNI_METHOD(void, RvcRunModeCluster, writeOnModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, RvcCleanModeCluster, writeOnModeAttribute)
+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::RvcCleanMode::Attributes::OnMode::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>);
@@ -2790,8 +3306,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;
+    BooleanSensorConfigurationCluster * cppCluster = reinterpret_cast<BooleanSensorConfigurationCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2816,12 +3332,12 @@ JNI_METHOD(void, RvcCleanModeCluster, writeOnModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, DishwasherModeCluster, writeStartUpModeAttribute)
+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::DishwasherMode::Attributes::StartUpMode::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ValveConfigurationAndControl::Attributes::OpenDuration::TypeInfo;
     TypeInfo::Type cppValue;
 
     std::vector<Platform::UniquePtr<JniByteArray>> cleanupByteArrays;
@@ -2835,7 +3351,7 @@ JNI_METHOD(void, DishwasherModeCluster, writeStartUpModeAttribute)
     {
         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(
@@ -2850,8 +3366,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;
+    ValveConfigurationAndControlCluster * cppCluster = reinterpret_cast<ValveConfigurationAndControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2876,27 +3392,19 @@ JNI_METHOD(void, DishwasherModeCluster, writeStartUpModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, DishwasherModeCluster, 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::DishwasherMode::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>);
@@ -2910,8 +3418,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;
+    ValveConfigurationAndControlCluster * cppCluster = reinterpret_cast<ValveConfigurationAndControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2936,19 +3444,27 @@ JNI_METHOD(void, DishwasherModeCluster, writeOnModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, SmokeCoAlarmCluster, writeSmokeSensitivityLevelAttribute)
+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::SmokeCoAlarm::Attributes::SmokeSensitivityLevel::TypeInfo;
+    using TypeInfo = chip::app::Clusters::ValveConfigurationAndControl::Attributes::OpenLevel::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().IntegerToPrimitive(value));
+    }
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
         Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
@@ -2962,8 +3478,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;
+    ValveConfigurationAndControlCluster * cppCluster = reinterpret_cast<ValveConfigurationAndControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -2988,27 +3504,19 @@ JNI_METHOD(void, SmokeCoAlarmCluster, writeSmokeSensitivityLevelAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, HepaFilterMonitoringCluster, writeLastChangedTimeAttribute)
+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::HepaFilterMonitoring::Attributes::LastChangedTime::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().LongToPrimitive(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>);
@@ -3022,8 +3530,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;
+    DemandResponseLoadControlCluster * cppCluster = reinterpret_cast<DemandResponseLoadControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -3048,27 +3556,19 @@ JNI_METHOD(void, HepaFilterMonitoringCluster, writeLastChangedTimeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ActivatedCarbonFilterMonitoringCluster, writeLastChangedTimeAttribute)
+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::ActivatedCarbonFilterMonitoring::Attributes::LastChangedTime::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().LongToPrimitive(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>);
@@ -3082,8 +3582,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;
+    DemandResponseLoadControlCluster * cppCluster = reinterpret_cast<DemandResponseLoadControlCluster *>(clusterPtr);
     VerifyOrReturn(cppCluster != nullptr,
                    chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException(
                        env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
@@ -8279,57 +8779,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 118ea6f0f73f89..9a0482f90238ac 100644
--- a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
@@ -2479,6 +2479,26 @@ 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::OvenMode::Id: {
+        using namespace app::Clusters::OvenMode;
+        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)
@@ -3447,6 +3467,645 @@ 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::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 6c7d8b46e8a37d..965e31e1d1c841 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)
 {
@@ -2933,6 +3043,79 @@ void CHIPIcdManagementClusterRegisterClientResponseCallback::CallbackFn(
 
     env->CallVoidMethod(javaCallbackRef, javaMethod, ICDCounter);
 }
+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)
 {
diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h
index c6afa9916c41fa..bef0c68702b238 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>
 {
@@ -479,6 +494,21 @@ class CHIPIcdManagementClusterRegisterClientResponseCallback
     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>
 {
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
index 038b013d380d9c..b9daa797c64049 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)
@@ -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);
     }
 
@@ -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())
-    {
-        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);
+}
 
-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,31 @@ 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)
+CHIPOvenModeSupportedModesAttributeCallback::CHIPOvenModeSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOvenModeClusterSupportedModesAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19847,7 +19971,7 @@ CHIPModeSelectGeneratedCommandListAttributeCallback::CHIPModeSelectGeneratedComm
     }
 }
 
-CHIPModeSelectGeneratedCommandListAttributeCallback::~CHIPModeSelectGeneratedCommandListAttributeCallback()
+CHIPOvenModeSupportedModesAttributeCallback::~CHIPOvenModeSupportedModesAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19858,8 +19982,9 @@ CHIPModeSelectGeneratedCommandListAttributeCallback::~CHIPModeSelectGeneratedCom
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPModeSelectGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+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;
@@ -19868,8 +19993,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<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;
@@ -19888,11 +20013,85 @@ void CHIPModeSelectGeneratedCommandListAttributeCallback::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);
+        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$OvenModeClusterModeTagStruct", modeTagStructStructClass_3);
+            if (err != CHIP_NO_ERROR)
+            {
+                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$OvenModeClusterModeTagStruct 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$OvenModeClusterModeOptionStruct", modeOptionStructStructClass_1);
+        if (err != CHIP_NO_ERROR)
+        {
+            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$OvenModeClusterModeOptionStruct 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);
     }
 
@@ -19900,9 +20099,8 @@ void CHIPModeSelectGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPModeSelectAcceptedCommandListAttributeCallback::CHIPModeSelectAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPModeSelectClusterAcceptedCommandListAttributeCallbackType>(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)
@@ -19918,7 +20116,7 @@ CHIPModeSelectAcceptedCommandListAttributeCallback::CHIPModeSelectAcceptedComman
     }
 }
 
-CHIPModeSelectAcceptedCommandListAttributeCallback::~CHIPModeSelectAcceptedCommandListAttributeCallback()
+CHIPOvenModeStartUpModeAttributeCallback::~CHIPOvenModeStartUpModeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19929,8 +20127,7 @@ CHIPModeSelectAcceptedCommandListAttributeCallback::~CHIPModeSelectAcceptedComma
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPModeSelectAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPOvenModeStartUpModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -19938,9 +20135,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<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;
@@ -19948,31 +20144,94 @@ 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);
+}
+
+CHIPOvenModeOnModeAttributeCallback::CHIPOvenModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOvenModeClusterOnModeAttributeCallbackType>(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)
+CHIPOvenModeOnModeAttributeCallback::~CHIPOvenModeOnModeAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPOvenModeOnModeAttributeCallback::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<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;
+    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);
+}
+
+CHIPOvenModeGeneratedCommandListAttributeCallback::CHIPOvenModeGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPOvenModeClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19988,7 +20247,7 @@ CHIPModeSelectEventListAttributeCallback::CHIPModeSelectEventListAttributeCallba
     }
 }
 
-CHIPModeSelectEventListAttributeCallback::~CHIPModeSelectEventListAttributeCallback()
+CHIPOvenModeGeneratedCommandListAttributeCallback::~CHIPOvenModeGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -19999,8 +20258,8 @@ CHIPModeSelectEventListAttributeCallback::~CHIPModeSelectEventListAttributeCallb
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPModeSelectEventListAttributeCallback::CallbackFn(void * context,
-                                                          const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPOvenModeGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20009,8 +20268,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<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;
@@ -20041,8 +20300,9 @@ void CHIPModeSelectEventListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPModeSelectAttributeListAttributeCallback::CHIPModeSelectAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPModeSelectClusterAttributeListAttributeCallbackType>(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)
@@ -20058,7 +20318,7 @@ CHIPModeSelectAttributeListAttributeCallback::CHIPModeSelectAttributeListAttribu
     }
 }
 
-CHIPModeSelectAttributeListAttributeCallback::~CHIPModeSelectAttributeListAttributeCallback()
+CHIPOvenModeAcceptedCommandListAttributeCallback::~CHIPOvenModeAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20069,8 +20329,8 @@ CHIPModeSelectAttributeListAttributeCallback::~CHIPModeSelectAttributeListAttrib
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPModeSelectAttributeListAttributeCallback::CallbackFn(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPOvenModeAcceptedCommandListAttributeCallback::CallbackFn(void * context,
+                                                                  const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20079,8 +20339,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<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;
@@ -20111,10 +20371,8 @@ void CHIPModeSelectAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherModeSupportedModesAttributeCallback::CHIPLaundryWasherModeSupportedModesAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherModeClusterSupportedModesAttributeCallbackType>(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)
@@ -20130,7 +20388,7 @@ CHIPLaundryWasherModeSupportedModesAttributeCallback::CHIPLaundryWasherModeSuppo
     }
 }
 
-CHIPLaundryWasherModeSupportedModesAttributeCallback::~CHIPLaundryWasherModeSupportedModesAttributeCallback()
+CHIPOvenModeEventListAttributeCallback::~CHIPOvenModeEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20141,10 +20399,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 CHIPOvenModeEventListAttributeCallback::CallbackFn(void * context,
+                                                        const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20153,8 +20409,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<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;
@@ -20173,10 +20429,2433 @@ 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_0_modeClassName     = "java/lang/Integer";
+        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);
+}
+
+CHIPOvenModeAttributeListAttributeCallback::CHIPOvenModeAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOvenModeClusterAttributeListAttributeCallbackType>(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");
+    }
+}
+
+CHIPOvenModeAttributeListAttributeCallback::~CHIPOvenModeAttributeListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPOvenModeAttributeListAttributeCallback::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<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;
+    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);
+}
+
+CHIPModeSelectStandardNamespaceAttributeCallback::CHIPModeSelectStandardNamespaceAttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPModeSelectClusterStandardNamespaceAttributeCallbackType>(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");
+    }
+}
+
+CHIPModeSelectStandardNamespaceAttributeCallback::~CHIPModeSelectStandardNamespaceAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPModeSelectStandardNamespaceAttributeCallback::CallbackFn(void * context,
+                                                                  const chip::app::DataModel::Nullable<uint16_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<CHIPModeSelectStandardNamespaceAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPModeSelectStandardNamespaceAttributeCallback *>(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;
+    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_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);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPModeSelectStartUpModeAttributeCallback::CHIPModeSelectStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPModeSelectClusterStartUpModeAttributeCallbackType>(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");
+    }
+}
+
+CHIPModeSelectStartUpModeAttributeCallback::~CHIPModeSelectStartUpModeAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPModeSelectStartUpModeAttributeCallback::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<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;
+    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);
+}
+
+CHIPModeSelectOnModeAttributeCallback::CHIPModeSelectOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPModeSelectClusterOnModeAttributeCallbackType>(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");
+    }
+}
+
+CHIPModeSelectOnModeAttributeCallback::~CHIPModeSelectOnModeAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPModeSelectOnModeAttributeCallback::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<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;
+    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);
+}
+
+CHIPModeSelectGeneratedCommandListAttributeCallback::CHIPModeSelectGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPModeSelectClusterGeneratedCommandListAttributeCallbackType>(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");
+    }
+}
+
+CHIPModeSelectGeneratedCommandListAttributeCallback::~CHIPModeSelectGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPModeSelectGeneratedCommandListAttributeCallback::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<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;
+    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);
+}
+
+CHIPModeSelectAcceptedCommandListAttributeCallback::CHIPModeSelectAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPModeSelectClusterAcceptedCommandListAttributeCallbackType>(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");
+    }
+}
+
+CHIPModeSelectAcceptedCommandListAttributeCallback::~CHIPModeSelectAcceptedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPModeSelectAcceptedCommandListAttributeCallback::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<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;
+    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);
+}
+
+CHIPModeSelectEventListAttributeCallback::CHIPModeSelectEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPModeSelectClusterEventListAttributeCallbackType>(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");
+    }
+}
+
+CHIPModeSelectEventListAttributeCallback::~CHIPModeSelectEventListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPModeSelectEventListAttributeCallback::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<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;
+    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);
+}
+
+CHIPModeSelectAttributeListAttributeCallback::CHIPModeSelectAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPModeSelectClusterAttributeListAttributeCallbackType>(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");
+    }
+}
+
+CHIPModeSelectAttributeListAttributeCallback::~CHIPModeSelectAttributeListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPModeSelectAttributeListAttributeCallback::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<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;
+    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);
+}
+
+CHIPLaundryWasherModeSupportedModesAttributeCallback::CHIPLaundryWasherModeSupportedModesAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherModeClusterSupportedModesAttributeCallbackType>(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");
+    }
+}
+
+CHIPLaundryWasherModeSupportedModesAttributeCallback::~CHIPLaundryWasherModeSupportedModesAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPLaundryWasherModeSupportedModesAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryWasherMode::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<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;
+    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$LaundryWasherModeClusterModeTagStruct", modeTagStructStructClass_3);
+            if (err != CHIP_NO_ERROR)
+            {
+                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$LaundryWasherModeClusterModeTagStruct 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$LaundryWasherModeClusterModeOptionStruct", modeOptionStructStructClass_1);
+        if (err != CHIP_NO_ERROR)
+        {
+            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$LaundryWasherModeClusterModeOptionStruct 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);
+}
+
+CHIPLaundryWasherModeStartUpModeAttributeCallback::CHIPLaundryWasherModeStartUpModeAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherModeClusterStartUpModeAttributeCallbackType>(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");
+    }
+}
+
+CHIPLaundryWasherModeStartUpModeAttributeCallback::~CHIPLaundryWasherModeStartUpModeAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPLaundryWasherModeStartUpModeAttributeCallback::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<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;
+    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);
+}
+
+CHIPLaundryWasherModeOnModeAttributeCallback::CHIPLaundryWasherModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherModeClusterOnModeAttributeCallbackType>(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");
+    }
+}
+
+CHIPLaundryWasherModeOnModeAttributeCallback::~CHIPLaundryWasherModeOnModeAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+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;
+    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<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;
+    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);
+}
+
+CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::CHIPLaundryWasherModeAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherModeClusterAcceptedCommandListAttributeCallbackType>(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");
+    }
+}
+
+CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::~CHIPLaundryWasherModeAcceptedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::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<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;
+    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);
+}
+
+CHIPLaundryWasherModeEventListAttributeCallback::CHIPLaundryWasherModeEventListAttributeCallback(jobject javaCallback,
+                                                                                                 bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherModeClusterEventListAttributeCallbackType>(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");
+    }
+}
+
+CHIPLaundryWasherModeEventListAttributeCallback::~CHIPLaundryWasherModeEventListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPLaundryWasherModeEventListAttributeCallback::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<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;
+    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);
+}
+
+CHIPLaundryWasherModeAttributeListAttributeCallback::CHIPLaundryWasherModeAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherModeClusterAttributeListAttributeCallbackType>(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");
+    }
+}
+
+CHIPLaundryWasherModeAttributeListAttributeCallback::~CHIPLaundryWasherModeAttributeListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPLaundryWasherModeAttributeListAttributeCallback::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<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;
+    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);
+}
+
+CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback::
+CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterSupportedModesAttributeCallbackType>(
+        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");
+    }
+}
+
+CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<
+        chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::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<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;
+    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$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);
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    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),
+    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");
+    }
+}
+
+CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback::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<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;
+    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);
+}
+
+CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback::
+CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterGeneratedCommandListAttributeCallbackType>(
+        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");
+    }
+}
+
+CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback::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<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;
+    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);
+}
+
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback::
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterAcceptedCommandListAttributeCallbackType>(
+        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");
+    }
+}
+
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback::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<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;
+    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);
+}
+
+CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback::
+CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterEventListAttributeCallbackType>(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");
+    }
+}
+
+CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback::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<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;
+    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);
+}
+
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback::
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterAttributeListAttributeCallbackType>(
+        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");
+    }
+}
+
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback::~
+CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback::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<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;
+    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);
+}
+
+CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::CHIPLaundryWasherControlsSpinSpeedsAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherControlsClusterSpinSpeedsAttributeCallbackType>(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");
+    }
+}
+
+CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::~CHIPLaundryWasherControlsSpinSpeedsAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::CallbackFn(
+    void * context, const 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<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/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;
+        LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0, newElement_0));
+        chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback::CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherControlsClusterSpinSpeedCurrentAttributeCallbackType>(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");
+    }
+}
+
+CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback::~CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback::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<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;
+    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);
+}
+
+CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::CHIPLaundryWasherControlsSupportedRinsesAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherControlsClusterSupportedRinsesAttributeCallbackType>(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");
+    }
+}
+
+CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::~CHIPLaundryWasherControlsSupportedRinsesAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+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;
+    JNIEnv * env   = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    jobject javaCallbackRef;
+
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+    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;
+    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/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);
+    }
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback::CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherControlsClusterGeneratedCommandListAttributeCallbackType>(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");
+    }
+}
+
+CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback::~CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback::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<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;
+    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);
+}
+
+CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherControlsClusterAcceptedCommandListAttributeCallbackType>(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");
+    }
+}
+
+CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::~CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::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<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;
+    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);
+}
+
+CHIPLaundryWasherControlsEventListAttributeCallback::CHIPLaundryWasherControlsEventListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherControlsClusterEventListAttributeCallbackType>(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");
+    }
+}
+
+CHIPLaundryWasherControlsEventListAttributeCallback::~CHIPLaundryWasherControlsEventListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPLaundryWasherControlsEventListAttributeCallback::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<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;
+    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);
+}
+
+CHIPLaundryWasherControlsAttributeListAttributeCallback::CHIPLaundryWasherControlsAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPLaundryWasherControlsClusterAttributeListAttributeCallbackType>(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");
+    }
+}
+
+CHIPLaundryWasherControlsAttributeListAttributeCallback::~CHIPLaundryWasherControlsAttributeListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPLaundryWasherControlsAttributeListAttributeCallback::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<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;
+    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);
+}
+
+CHIPRvcRunModeSupportedModesAttributeCallback::CHIPRvcRunModeSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcRunModeClusterSupportedModesAttributeCallbackType>(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");
+    }
+}
+
+CHIPRvcRunModeSupportedModesAttributeCallback::~CHIPRvcRunModeSupportedModesAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPRvcRunModeSupportedModesAttributeCallback::CallbackFn(
+    void * context,
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::RvcRunMode::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<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;
+    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>(
@@ -20215,17 +22894,17 @@ void CHIPLaundryWasherModeSupportedModesAttributeCallback::CallbackFn(
 
             jclass modeTagStructStructClass_3;
             err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$LaundryWasherModeClusterModeTagStruct", modeTagStructStructClass_3);
+                env, "chip/devicecontroller/ChipStructs$RvcRunModeClusterModeTagStruct", modeTagStructStructClass_3);
             if (err != CHIP_NO_ERROR)
             {
-                ChipLogError(Zcl, "Could not find class ChipStructs$LaundryWasherModeClusterModeTagStruct");
+                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$LaundryWasherModeClusterModeTagStruct constructor");
+                ChipLogError(Zcl, "Could not find ChipStructs$RvcRunModeClusterModeTagStruct constructor");
                 return;
             }
 
@@ -20236,98 +22915,31 @@ void CHIPLaundryWasherModeSupportedModesAttributeCallback::CallbackFn(
 
         jclass modeOptionStructStructClass_1;
         err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$LaundryWasherModeClusterModeOptionStruct", modeOptionStructStructClass_1);
+            env, "chip/devicecontroller/ChipStructs$RvcRunModeClusterModeOptionStruct", modeOptionStructStructClass_1);
         if (err != CHIP_NO_ERROR)
-        {
-            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$LaundryWasherModeClusterModeOptionStruct 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);
-}
-
-CHIPLaundryWasherModeStartUpModeAttributeCallback::CHIPLaundryWasherModeStartUpModeAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherModeClusterStartUpModeAttributeCallbackType>(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");
-    }
-}
-
-CHIPLaundryWasherModeStartUpModeAttributeCallback::~CHIPLaundryWasherModeStartUpModeAttributeCallback()
-{
-    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-    if (env == nullptr)
-    {
-        ChipLogError(Zcl, "Could not delete global reference for Java callback");
-        return;
-    }
-    env->DeleteGlobalRef(javaCallbackRef);
-}
-
-void CHIPLaundryWasherModeStartUpModeAttributeCallback::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<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;
-    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"));
+        {
+            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$RvcRunModeClusterModeOptionStruct constructor");
+            return;
+        }
 
-    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);
+        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->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherModeOnModeAttributeCallback::CHIPLaundryWasherModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherModeClusterOnModeAttributeCallbackType>(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)
@@ -20343,7 +22955,7 @@ CHIPLaundryWasherModeOnModeAttributeCallback::CHIPLaundryWasherModeOnModeAttribu
     }
 }
 
-CHIPLaundryWasherModeOnModeAttributeCallback::~CHIPLaundryWasherModeOnModeAttributeCallback()
+CHIPRvcRunModeOnModeAttributeCallback::~CHIPRvcRunModeOnModeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20354,7 +22966,7 @@ CHIPLaundryWasherModeOnModeAttributeCallback::~CHIPLaundryWasherModeOnModeAttrib
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherModeOnModeAttributeCallback::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;
@@ -20362,8 +22974,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<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;
@@ -20391,10 +23003,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)
+CHIPRvcRunModeGeneratedCommandListAttributeCallback::CHIPRvcRunModeGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcRunModeClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20410,7 +23021,7 @@ CHIPLaundryWasherModeGeneratedCommandListAttributeCallback::CHIPLaundryWasherMod
     }
 }
 
-CHIPLaundryWasherModeGeneratedCommandListAttributeCallback::~CHIPLaundryWasherModeGeneratedCommandListAttributeCallback()
+CHIPRvcRunModeGeneratedCommandListAttributeCallback::~CHIPRvcRunModeGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20421,7 +23032,7 @@ CHIPLaundryWasherModeGeneratedCommandListAttributeCallback::~CHIPLaundryWasherMo
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherModeGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPRvcRunModeGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -20431,8 +23042,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<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;
@@ -20463,10 +23074,9 @@ void CHIPLaundryWasherModeGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::CHIPLaundryWasherModeAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherModeClusterAcceptedCommandListAttributeCallbackType>(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)
@@ -20482,7 +23092,7 @@ CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::CHIPLaundryWasherMode
     }
 }
 
-CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::~CHIPLaundryWasherModeAcceptedCommandListAttributeCallback()
+CHIPRvcRunModeAcceptedCommandListAttributeCallback::~CHIPRvcRunModeAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20493,7 +23103,7 @@ CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::~CHIPLaundryWasherMod
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPRvcRunModeAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -20503,8 +23113,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<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;
@@ -20535,9 +23145,8 @@ void CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherModeEventListAttributeCallback::CHIPLaundryWasherModeEventListAttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherModeClusterEventListAttributeCallbackType>(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)
@@ -20553,7 +23162,7 @@ CHIPLaundryWasherModeEventListAttributeCallback::CHIPLaundryWasherModeEventListA
     }
 }
 
-CHIPLaundryWasherModeEventListAttributeCallback::~CHIPLaundryWasherModeEventListAttributeCallback()
+CHIPRvcRunModeEventListAttributeCallback::~CHIPRvcRunModeEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20564,8 +23173,8 @@ CHIPLaundryWasherModeEventListAttributeCallback::~CHIPLaundryWasherModeEventList
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherModeEventListAttributeCallback::CallbackFn(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPRvcRunModeEventListAttributeCallback::CallbackFn(void * context,
+                                                          const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20574,8 +23183,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<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;
@@ -20606,9 +23215,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)
+CHIPRvcRunModeAttributeListAttributeCallback::CHIPRvcRunModeAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcRunModeClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20624,7 +23232,7 @@ CHIPLaundryWasherModeAttributeListAttributeCallback::CHIPLaundryWasherModeAttrib
     }
 }
 
-CHIPLaundryWasherModeAttributeListAttributeCallback::~CHIPLaundryWasherModeAttributeListAttributeCallback()
+CHIPRvcRunModeAttributeListAttributeCallback::~CHIPRvcRunModeAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20635,8 +23243,8 @@ CHIPLaundryWasherModeAttributeListAttributeCallback::~CHIPLaundryWasherModeAttri
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherModeAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPRvcRunModeAttributeListAttributeCallback::CallbackFn(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20645,8 +23253,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<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;
@@ -20677,11 +23285,9 @@ void CHIPLaundryWasherModeAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback::
-CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterSupportedModesAttributeCallbackType>(
-        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)
@@ -20697,8 +23303,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallba
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback::~
-CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback()
+CHIPRvcCleanModeSupportedModesAttributeCallback::~CHIPRvcCleanModeSupportedModesAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20709,10 +23314,9 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallba
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback::CallbackFn(
+void CHIPRvcCleanModeSupportedModesAttributeCallback::CallbackFn(
     void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Structs::ModeOptionStruct::DecodableType> & list)
+    const chip::app::DataModel::DecodableList<chip::app::Clusters::RvcCleanMode::Structs::ModeOptionStruct::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20721,9 +23325,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<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;
@@ -20784,21 +23387,17 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeC
 
             jclass modeTagStructStructClass_3;
             err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct",
-                modeTagStructStructClass_3);
+                env, "chip/devicecontroller/ChipStructs$RvcCleanModeClusterModeTagStruct", modeTagStructStructClass_3);
             if (err != CHIP_NO_ERROR)
             {
-                ChipLogError(
-                    Zcl, "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct");
+                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$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct constructor");
+                ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeClusterModeTagStruct constructor");
                 return;
             }
 
@@ -20809,21 +23408,17 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeC
 
         jclass modeOptionStructStructClass_1;
         err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct",
-            modeOptionStructStructClass_1);
+            env, "chip/devicecontroller/ChipStructs$RvcCleanModeClusterModeOptionStruct", modeOptionStructStructClass_1);
         if (err != CHIP_NO_ERROR)
         {
-            ChipLogError(Zcl,
-                         "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct");
+            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$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct constructor");
+            ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeClusterModeOptionStruct constructor");
             return;
         }
 
@@ -20836,11 +23431,8 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeC
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback::
-CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterStartUpModeAttributeCallbackType>(CallbackFn,
-                                                                                                                         this),
-    keepAlive(keepAlive)
+CHIPRvcCleanModeOnModeAttributeCallback::CHIPRvcCleanModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcCleanModeClusterOnModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20856,8 +23448,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback(
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback::~
-CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback()
+CHIPRvcCleanModeOnModeAttributeCallback::~CHIPRvcCleanModeOnModeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20868,8 +23459,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback(
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPRvcCleanModeOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20877,9 +23467,8 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCall
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback, decltype(&maybeDestroy)>
-        cppCallback(reinterpret_cast<CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback *>(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;
@@ -20907,10 +23496,9 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCall
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback::
-CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterOnModeAttributeCallbackType>(CallbackFn,
-                                                                                                                    this),
+CHIPRvcCleanModeGeneratedCommandListAttributeCallback::CHIPRvcCleanModeGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcCleanModeClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -20927,8 +23515,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback(jobje
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback::~
-CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback()
+CHIPRvcCleanModeGeneratedCommandListAttributeCallback::~CHIPRvcCleanModeGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -20939,8 +23526,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPRvcCleanModeGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -20948,9 +23535,9 @@ 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<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;
@@ -20958,31 +23545,103 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback:
                    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;
+        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);
     }
-    else
+
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPRvcCleanModeAcceptedCommandListAttributeCallback::CHIPRvcCleanModeAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcCleanModeClusterAcceptedCommandListAttributeCallbackType>(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");
+    }
+}
+
+CHIPRvcCleanModeAcceptedCommandListAttributeCallback::~CHIPRvcCleanModeAcceptedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPRvcCleanModeAcceptedCommandListAttributeCallback::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<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;
+    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())
     {
-        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);
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback::
-CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterGeneratedCommandListAttributeCallbackType>(
-        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)
@@ -20998,8 +23657,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttribute
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback::~
-CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback()
+CHIPRvcCleanModeEventListAttributeCallback::~CHIPRvcCleanModeEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21010,8 +23668,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttribute
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPRvcCleanModeEventListAttributeCallback::CallbackFn(void * context,
+                                                            const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21020,11 +23678,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<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;
@@ -21055,11 +23710,9 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttr
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback::
-CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterAcceptedCommandListAttributeCallbackType>(
-        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)
@@ -21075,8 +23728,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeC
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback::~
-CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback()
+CHIPRvcCleanModeAttributeListAttributeCallback::~CHIPRvcCleanModeAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21087,8 +23739,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback::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;
@@ -21097,11 +23749,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<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;
@@ -21132,10 +23781,9 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttri
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback::
-CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterEventListAttributeCallbackType>(CallbackFn,
-                                                                                                                       this),
+CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::
+CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTemperatureControlClusterSupportedTemperatureLevelsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -21152,8 +23800,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback(jo
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback::~
-CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback()
+CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::~
+CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21164,8 +23812,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21174,9 +23822,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<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;
@@ -21195,11 +23842,7 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallba
     {
         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);
     }
 
@@ -21207,10 +23850,9 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallba
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback::
-CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterAttributeListAttributeCallbackType>(
-        CallbackFn, this),
+CHIPTemperatureControlGeneratedCommandListAttributeCallback::CHIPTemperatureControlGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTemperatureControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -21227,8 +23869,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallbac
     }
 }
 
-CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback::~
-CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback()
+CHIPTemperatureControlGeneratedCommandListAttributeCallback::~CHIPTemperatureControlGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21239,8 +23880,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallbac
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPTemperatureControlGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21249,9 +23890,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<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;
@@ -21282,9 +23922,9 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCa
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::CHIPLaundryWasherControlsSpinSpeedsAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherControlsClusterSpinSpeedsAttributeCallbackType>(CallbackFn, this),
+CHIPTemperatureControlAcceptedCommandListAttributeCallback::CHIPTemperatureControlAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPTemperatureControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -21301,7 +23941,7 @@ CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::CHIPLaundryWasherControlsS
     }
 }
 
-CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::~CHIPLaundryWasherControlsSpinSpeedsAttributeCallback()
+CHIPTemperatureControlAcceptedCommandListAttributeCallback::~CHIPTemperatureControlAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21312,8 +23952,8 @@ CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::~CHIPLaundryWasherControls
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & list)
+void CHIPTemperatureControlAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21322,8 +23962,8 @@ void CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPLaundryWasherControlsSpinSpeedsAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPLaundryWasherControlsSpinSpeedsAttributeCallback *>(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;
@@ -21342,7 +23982,11 @@ void CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::CallbackFn(
     {
         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);
     }
 
@@ -21350,10 +23994,9 @@ void CHIPLaundryWasherControlsSpinSpeedsAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback::CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherControlsClusterSpinSpeedCurrentAttributeCallbackType>(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)
@@ -21369,7 +24012,7 @@ CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback::CHIPLaundryWasherCon
     }
 }
 
-CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback::~CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback()
+CHIPTemperatureControlEventListAttributeCallback::~CHIPTemperatureControlEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21380,8 +24023,8 @@ CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback::~CHIPLaundryWasherCo
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback::CallbackFn(void * context,
-                                                                            const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPTemperatureControlEventListAttributeCallback::CallbackFn(void * context,
+                                                                  const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21389,8 +24032,9 @@ 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<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;
@@ -21398,29 +24042,32 @@ void CHIPLaundryWasherControlsSpinSpeedCurrentAttributeCallback::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/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);
 }
 
-CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::CHIPLaundryWasherControlsSupportedRinsesAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherControlsClusterSupportedRinsesAttributeCallbackType>(CallbackFn, this),
+CHIPTemperatureControlAttributeListAttributeCallback::CHIPTemperatureControlAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPTemperatureControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -21437,7 +24084,7 @@ CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::CHIPLaundryWasherCont
     }
 }
 
-CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::~CHIPLaundryWasherControlsSupportedRinsesAttributeCallback()
+CHIPTemperatureControlAttributeListAttributeCallback::~CHIPTemperatureControlAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21448,9 +24095,8 @@ CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::~CHIPLaundryWasherCon
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum> & list)
+void CHIPTemperatureControlAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21459,8 +24105,8 @@ void CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::CallbackFn(
 
     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<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;
@@ -21479,11 +24125,11 @@ void CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::CallbackFn(
     {
         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);
+        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);
     }
 
@@ -21491,9 +24137,9 @@ void CHIPLaundryWasherControlsSupportedRinsesAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback::CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback(
+CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherControlsClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPRefrigeratorAlarmClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -21510,7 +24156,7 @@ CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback::CHIPLaundryWashe
     }
 }
 
-CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback::~CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback()
+CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::~CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21521,7 +24167,7 @@ CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback::~CHIPLaundryWash
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -21531,8 +24177,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<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;
@@ -21563,9 +24209,9 @@ void CHIPLaundryWasherControlsGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback(
+CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherControlsClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPRefrigeratorAlarmClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -21582,7 +24228,7 @@ CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::CHIPLaundryWasher
     }
 }
 
-CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::~CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback()
+CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::~CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21593,7 +24239,7 @@ CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::~CHIPLaundryWashe
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -21603,8 +24249,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<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;
@@ -21635,9 +24281,9 @@ void CHIPLaundryWasherControlsAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherControlsEventListAttributeCallback::CHIPLaundryWasherControlsEventListAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherControlsClusterEventListAttributeCallbackType>(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)
@@ -21653,7 +24299,7 @@ CHIPLaundryWasherControlsEventListAttributeCallback::CHIPLaundryWasherControlsEv
     }
 }
 
-CHIPLaundryWasherControlsEventListAttributeCallback::~CHIPLaundryWasherControlsEventListAttributeCallback()
+CHIPRefrigeratorAlarmEventListAttributeCallback::~CHIPRefrigeratorAlarmEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21664,8 +24310,8 @@ CHIPLaundryWasherControlsEventListAttributeCallback::~CHIPLaundryWasherControlsE
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherControlsEventListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPRefrigeratorAlarmEventListAttributeCallback::CallbackFn(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21674,8 +24320,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<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;
@@ -21706,10 +24352,9 @@ void CHIPLaundryWasherControlsEventListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPLaundryWasherControlsAttributeListAttributeCallback::CHIPLaundryWasherControlsAttributeListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPLaundryWasherControlsClusterAttributeListAttributeCallbackType>(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)
@@ -21725,7 +24370,7 @@ CHIPLaundryWasherControlsAttributeListAttributeCallback::CHIPLaundryWasherContro
     }
 }
 
-CHIPLaundryWasherControlsAttributeListAttributeCallback::~CHIPLaundryWasherControlsAttributeListAttributeCallback()
+CHIPRefrigeratorAlarmAttributeListAttributeCallback::~CHIPRefrigeratorAlarmAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21736,7 +24381,7 @@ CHIPLaundryWasherControlsAttributeListAttributeCallback::~CHIPLaundryWasherContr
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPLaundryWasherControlsAttributeListAttributeCallback::CallbackFn(
+void CHIPRefrigeratorAlarmAttributeListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -21746,8 +24391,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<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;
@@ -21778,8 +24423,9 @@ void CHIPLaundryWasherControlsAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcRunModeSupportedModesAttributeCallback::CHIPRvcRunModeSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcRunModeClusterSupportedModesAttributeCallbackType>(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)
@@ -21795,7 +24441,7 @@ CHIPRvcRunModeSupportedModesAttributeCallback::CHIPRvcRunModeSupportedModesAttri
     }
 }
 
-CHIPRvcRunModeSupportedModesAttributeCallback::~CHIPRvcRunModeSupportedModesAttributeCallback()
+CHIPDishwasherModeSupportedModesAttributeCallback::~CHIPDishwasherModeSupportedModesAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21806,9 +24452,9 @@ CHIPRvcRunModeSupportedModesAttributeCallback::~CHIPRvcRunModeSupportedModesAttr
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcRunModeSupportedModesAttributeCallback::CallbackFn(
+void CHIPDishwasherModeSupportedModesAttributeCallback::CallbackFn(
     void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::RvcRunMode::Structs::ModeOptionStruct::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;
@@ -21817,8 +24463,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<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;
@@ -21879,17 +24525,17 @@ void CHIPRvcRunModeSupportedModesAttributeCallback::CallbackFn(
 
             jclass modeTagStructStructClass_3;
             err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$RvcRunModeClusterModeTagStruct", modeTagStructStructClass_3);
+                env, "chip/devicecontroller/ChipStructs$DishwasherModeClusterModeTagStruct", modeTagStructStructClass_3);
             if (err != CHIP_NO_ERROR)
             {
-                ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeClusterModeTagStruct");
+                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$RvcRunModeClusterModeTagStruct constructor");
+                ChipLogError(Zcl, "Could not find ChipStructs$DishwasherModeClusterModeTagStruct constructor");
                 return;
             }
 
@@ -21900,17 +24546,17 @@ void CHIPRvcRunModeSupportedModesAttributeCallback::CallbackFn(
 
         jclass modeOptionStructStructClass_1;
         err = chip::JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipStructs$RvcRunModeClusterModeOptionStruct", modeOptionStructStructClass_1);
+            env, "chip/devicecontroller/ChipStructs$DishwasherModeClusterModeOptionStruct", modeOptionStructStructClass_1);
         if (err != CHIP_NO_ERROR)
         {
-            ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeClusterModeOptionStruct");
+            ChipLogError(Zcl, "Could not find class ChipStructs$DishwasherModeClusterModeOptionStruct");
             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$DishwasherModeClusterModeOptionStruct constructor");
             return;
         }
 
@@ -21923,8 +24569,9 @@ void CHIPRvcRunModeSupportedModesAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcRunModeOnModeAttributeCallback::CHIPRvcRunModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcRunModeClusterOnModeAttributeCallbackType>(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)
@@ -21940,7 +24587,7 @@ CHIPRvcRunModeOnModeAttributeCallback::CHIPRvcRunModeOnModeAttributeCallback(job
     }
 }
 
-CHIPRvcRunModeOnModeAttributeCallback::~CHIPRvcRunModeOnModeAttributeCallback()
+CHIPDishwasherModeStartUpModeAttributeCallback::~CHIPDishwasherModeStartUpModeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -21951,7 +24598,8 @@ CHIPRvcRunModeOnModeAttributeCallback::~CHIPRvcRunModeOnModeAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcRunModeOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPDishwasherModeStartUpModeAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -21959,8 +24607,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<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;
@@ -21988,9 +24636,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)
+CHIPDishwasherModeOnModeAttributeCallback::CHIPDishwasherModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDishwasherModeClusterOnModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22006,7 +24653,7 @@ CHIPRvcRunModeGeneratedCommandListAttributeCallback::CHIPRvcRunModeGeneratedComm
     }
 }
 
-CHIPRvcRunModeGeneratedCommandListAttributeCallback::~CHIPRvcRunModeGeneratedCommandListAttributeCallback()
+CHIPDishwasherModeOnModeAttributeCallback::~CHIPDishwasherModeOnModeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22017,7 +24664,74 @@ CHIPRvcRunModeGeneratedCommandListAttributeCallback::~CHIPRvcRunModeGeneratedCom
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcRunModeGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPDishwasherModeOnModeAttributeCallback::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<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;
+    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);
+}
+
+CHIPDishwasherModeGeneratedCommandListAttributeCallback::CHIPDishwasherModeGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDishwasherModeClusterGeneratedCommandListAttributeCallbackType>(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");
+    }
+}
+
+CHIPDishwasherModeGeneratedCommandListAttributeCallback::~CHIPDishwasherModeGeneratedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPDishwasherModeGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -22027,8 +24741,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<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;
@@ -22059,9 +24773,10 @@ void CHIPRvcRunModeGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcRunModeAcceptedCommandListAttributeCallback::CHIPRvcRunModeAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcRunModeClusterAcceptedCommandListAttributeCallbackType>(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)
@@ -22077,7 +24792,7 @@ CHIPRvcRunModeAcceptedCommandListAttributeCallback::CHIPRvcRunModeAcceptedComman
     }
 }
 
-CHIPRvcRunModeAcceptedCommandListAttributeCallback::~CHIPRvcRunModeAcceptedCommandListAttributeCallback()
+CHIPDishwasherModeAcceptedCommandListAttributeCallback::~CHIPDishwasherModeAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22088,7 +24803,7 @@ CHIPRvcRunModeAcceptedCommandListAttributeCallback::~CHIPRvcRunModeAcceptedComma
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcRunModeAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPDishwasherModeAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -22098,8 +24813,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<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;
@@ -22130,8 +24845,8 @@ void CHIPRvcRunModeAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcRunModeEventListAttributeCallback::CHIPRvcRunModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcRunModeClusterEventListAttributeCallbackType>(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)
@@ -22147,7 +24862,7 @@ CHIPRvcRunModeEventListAttributeCallback::CHIPRvcRunModeEventListAttributeCallba
     }
 }
 
-CHIPRvcRunModeEventListAttributeCallback::~CHIPRvcRunModeEventListAttributeCallback()
+CHIPDishwasherModeEventListAttributeCallback::~CHIPDishwasherModeEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22158,8 +24873,8 @@ CHIPRvcRunModeEventListAttributeCallback::~CHIPRvcRunModeEventListAttributeCallb
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcRunModeEventListAttributeCallback::CallbackFn(void * context,
-                                                          const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPDishwasherModeEventListAttributeCallback::CallbackFn(void * context,
+                                                              const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22168,8 +24883,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<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;
@@ -22200,8 +24915,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)
+CHIPDishwasherModeAttributeListAttributeCallback::CHIPDishwasherModeAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                   bool keepAlive) :
+    chip::Callback::Callback<CHIPDishwasherModeClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22217,7 +24933,7 @@ CHIPRvcRunModeAttributeListAttributeCallback::CHIPRvcRunModeAttributeListAttribu
     }
 }
 
-CHIPRvcRunModeAttributeListAttributeCallback::~CHIPRvcRunModeAttributeListAttributeCallback()
+CHIPDishwasherModeAttributeListAttributeCallback::~CHIPDishwasherModeAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22228,8 +24944,8 @@ CHIPRvcRunModeAttributeListAttributeCallback::~CHIPRvcRunModeAttributeListAttrib
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcRunModeAttributeListAttributeCallback::CallbackFn(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPDishwasherModeAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22238,8 +24954,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<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;
@@ -22270,9 +24986,9 @@ void CHIPRvcRunModeAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcCleanModeSupportedModesAttributeCallback::CHIPRvcCleanModeSupportedModesAttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcCleanModeClusterSupportedModesAttributeCallbackType>(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)
@@ -22288,7 +25004,7 @@ CHIPRvcCleanModeSupportedModesAttributeCallback::CHIPRvcCleanModeSupportedModesA
     }
 }
 
-CHIPRvcCleanModeSupportedModesAttributeCallback::~CHIPRvcCleanModeSupportedModesAttributeCallback()
+CHIPAirQualityGeneratedCommandListAttributeCallback::~CHIPAirQualityGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22299,9 +25015,8 @@ CHIPRvcCleanModeSupportedModesAttributeCallback::~CHIPRvcCleanModeSupportedModes
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcCleanModeSupportedModesAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::RvcCleanMode::Structs::ModeOptionStruct::DecodableType> & list)
+void CHIPAirQualityGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22310,8 +25025,8 @@ 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<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;
@@ -22330,85 +25045,82 @@ void CHIPRvcCleanModeSupportedModesAttributeCallback::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_modeTags;
-        chip::JniReferences::GetInstance().CreateArrayList(newElement_0_modeTags);
+        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);
+    }
 
-        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);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+}
+
+CHIPAirQualityAcceptedCommandListAttributeCallback::CHIPAirQualityAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPAirQualityClusterAcceptedCommandListAttributeCallbackType>(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");
+    }
+}
+
+CHIPAirQualityAcceptedCommandListAttributeCallback::~CHIPAirQualityAcceptedCommandListAttributeCallback()
+{
+    JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+    if (env == nullptr)
+    {
+        ChipLogError(Zcl, "Could not delete global reference for Java callback");
+        return;
+    }
+    env->DeleteGlobalRef(javaCallbackRef);
+}
 
-            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;
-            }
+void CHIPAirQualityAcceptedCommandListAttributeCallback::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;
 
-            newElement_2 =
-                env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, newElement_2_value);
-            chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2);
-        }
+    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        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;
-        }
+    std::unique_ptr<CHIPAirQualityAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+        reinterpret_cast<CHIPAirQualityAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
 
-        newElement_0 = env->NewObject(modeOptionStructStructClass_1, modeOptionStructStructCtor_1, newElement_0_label,
-                                      newElement_0_mode, newElement_0_modeTags);
+    // 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);
     }
 
@@ -22416,8 +25128,8 @@ void CHIPRvcCleanModeSupportedModesAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcCleanModeOnModeAttributeCallback::CHIPRvcCleanModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcCleanModeClusterOnModeAttributeCallbackType>(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)
@@ -22433,7 +25145,7 @@ CHIPRvcCleanModeOnModeAttributeCallback::CHIPRvcCleanModeOnModeAttributeCallback
     }
 }
 
-CHIPRvcCleanModeOnModeAttributeCallback::~CHIPRvcCleanModeOnModeAttributeCallback()
+CHIPAirQualityEventListAttributeCallback::~CHIPAirQualityEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22444,7 +25156,8 @@ CHIPRvcCleanModeOnModeAttributeCallback::~CHIPRvcCleanModeOnModeAttributeCallbac
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcCleanModeOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPAirQualityEventListAttributeCallback::CallbackFn(void * context,
+                                                          const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22452,8 +25165,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<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;
@@ -22461,30 +25175,31 @@ void CHIPRvcCleanModeOnModeAttributeCallback::CallbackFn(void * context, const c
                    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);
 }
 
-CHIPRvcCleanModeGeneratedCommandListAttributeCallback::CHIPRvcCleanModeGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcCleanModeClusterGeneratedCommandListAttributeCallbackType>(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)
@@ -22500,7 +25215,7 @@ CHIPRvcCleanModeGeneratedCommandListAttributeCallback::CHIPRvcCleanModeGenerated
     }
 }
 
-CHIPRvcCleanModeGeneratedCommandListAttributeCallback::~CHIPRvcCleanModeGeneratedCommandListAttributeCallback()
+CHIPAirQualityAttributeListAttributeCallback::~CHIPAirQualityAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22511,8 +25226,8 @@ CHIPRvcCleanModeGeneratedCommandListAttributeCallback::~CHIPRvcCleanModeGenerate
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcCleanModeGeneratedCommandListAttributeCallback::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;
@@ -22521,8 +25236,8 @@ void CHIPRvcCleanModeGeneratedCommandListAttributeCallback::CallbackFn(
 
     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<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;
@@ -22553,9 +25268,9 @@ void CHIPRvcCleanModeGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcCleanModeAcceptedCommandListAttributeCallback::CHIPRvcCleanModeAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcCleanModeClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback::CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPSmokeCoAlarmClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -22572,7 +25287,7 @@ CHIPRvcCleanModeAcceptedCommandListAttributeCallback::CHIPRvcCleanModeAcceptedCo
     }
 }
 
-CHIPRvcCleanModeAcceptedCommandListAttributeCallback::~CHIPRvcCleanModeAcceptedCommandListAttributeCallback()
+CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback::~CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22583,7 +25298,7 @@ CHIPRvcCleanModeAcceptedCommandListAttributeCallback::~CHIPRvcCleanModeAcceptedC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcCleanModeAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -22593,8 +25308,8 @@ 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<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;
@@ -22625,8 +25340,10 @@ void CHIPRvcCleanModeAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcCleanModeEventListAttributeCallback::CHIPRvcCleanModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcCleanModeClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPSmokeCoAlarmClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22642,7 +25359,7 @@ CHIPRvcCleanModeEventListAttributeCallback::CHIPRvcCleanModeEventListAttributeCa
     }
 }
 
-CHIPRvcCleanModeEventListAttributeCallback::~CHIPRvcCleanModeEventListAttributeCallback()
+CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::~CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22653,8 +25370,8 @@ CHIPRvcCleanModeEventListAttributeCallback::~CHIPRvcCleanModeEventListAttributeC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcCleanModeEventListAttributeCallback::CallbackFn(void * context,
-                                                            const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22663,8 +25380,8 @@ 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<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;
@@ -22695,9 +25412,8 @@ void CHIPRvcCleanModeEventListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcCleanModeAttributeListAttributeCallback::CHIPRvcCleanModeAttributeListAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcCleanModeClusterAttributeListAttributeCallbackType>(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)
@@ -22713,7 +25429,7 @@ CHIPRvcCleanModeAttributeListAttributeCallback::CHIPRvcCleanModeAttributeListAtt
     }
 }
 
-CHIPRvcCleanModeAttributeListAttributeCallback::~CHIPRvcCleanModeAttributeListAttributeCallback()
+CHIPSmokeCoAlarmEventListAttributeCallback::~CHIPSmokeCoAlarmEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22724,8 +25440,8 @@ CHIPRvcCleanModeAttributeListAttributeCallback::~CHIPRvcCleanModeAttributeListAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcCleanModeAttributeListAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPSmokeCoAlarmEventListAttributeCallback::CallbackFn(void * context,
+                                                            const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22734,8 +25450,8 @@ 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<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;
@@ -22766,10 +25482,9 @@ void CHIPRvcCleanModeAttributeListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::
-CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTemperatureControlClusterSupportedTemperatureLevelsAttributeCallbackType>(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)
@@ -22785,8 +25500,7 @@ CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback(jobject javaCa
     }
 }
 
-CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::~
-CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback()
+CHIPSmokeCoAlarmAttributeListAttributeCallback::~CHIPSmokeCoAlarmAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22797,8 +25511,8 @@ CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CharSpan> & list)
+void CHIPSmokeCoAlarmAttributeListAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -22807,8 +25521,8 @@ 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<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;
@@ -22827,7 +25541,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 +25553,9 @@ void CHIPTemperatureControlSupportedTemperatureLevelsAttributeCallback::Callback
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTemperatureControlGeneratedCommandListAttributeCallback::CHIPTemperatureControlGeneratedCommandListAttributeCallback(
+CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::CHIPDishwasherAlarmGeneratedCommandListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTemperatureControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPDishwasherAlarmClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -22854,7 +25572,7 @@ CHIPTemperatureControlGeneratedCommandListAttributeCallback::CHIPTemperatureCont
     }
 }
 
-CHIPTemperatureControlGeneratedCommandListAttributeCallback::~CHIPTemperatureControlGeneratedCommandListAttributeCallback()
+CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::~CHIPDishwasherAlarmGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22865,7 +25583,7 @@ CHIPTemperatureControlGeneratedCommandListAttributeCallback::~CHIPTemperatureCon
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTemperatureControlGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -22875,8 +25593,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<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;
@@ -22907,9 +25625,9 @@ void CHIPTemperatureControlGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTemperatureControlAcceptedCommandListAttributeCallback::CHIPTemperatureControlAcceptedCommandListAttributeCallback(
+CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::CHIPDishwasherAlarmAcceptedCommandListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPTemperatureControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPDishwasherAlarmClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -22926,7 +25644,7 @@ CHIPTemperatureControlAcceptedCommandListAttributeCallback::CHIPTemperatureContr
     }
 }
 
-CHIPTemperatureControlAcceptedCommandListAttributeCallback::~CHIPTemperatureControlAcceptedCommandListAttributeCallback()
+CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::~CHIPDishwasherAlarmAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22937,7 +25655,7 @@ CHIPTemperatureControlAcceptedCommandListAttributeCallback::~CHIPTemperatureCont
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTemperatureControlAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -22947,8 +25665,8 @@ void CHIPTemperatureControlAcceptedCommandListAttributeCallback::CallbackFn(
 
     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<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;
@@ -22979,9 +25697,8 @@ void CHIPTemperatureControlAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTemperatureControlEventListAttributeCallback::CHIPTemperatureControlEventListAttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPTemperatureControlClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPDishwasherAlarmEventListAttributeCallback::CHIPDishwasherAlarmEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDishwasherAlarmClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -22997,7 +25714,7 @@ CHIPTemperatureControlEventListAttributeCallback::CHIPTemperatureControlEventLis
     }
 }
 
-CHIPTemperatureControlEventListAttributeCallback::~CHIPTemperatureControlEventListAttributeCallback()
+CHIPDishwasherAlarmEventListAttributeCallback::~CHIPDishwasherAlarmEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23008,8 +25725,8 @@ CHIPTemperatureControlEventListAttributeCallback::~CHIPTemperatureControlEventLi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTemperatureControlEventListAttributeCallback::CallbackFn(void * context,
-                                                                  const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPDishwasherAlarmEventListAttributeCallback::CallbackFn(void * context,
+                                                               const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23018,8 +25735,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<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;
@@ -23050,10 +25767,9 @@ void CHIPTemperatureControlEventListAttributeCallback::CallbackFn(void * context
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPTemperatureControlAttributeListAttributeCallback::CHIPTemperatureControlAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPTemperatureControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPDishwasherAlarmAttributeListAttributeCallback::CHIPDishwasherAlarmAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPDishwasherAlarmClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23069,7 +25785,7 @@ CHIPTemperatureControlAttributeListAttributeCallback::CHIPTemperatureControlAttr
     }
 }
 
-CHIPTemperatureControlAttributeListAttributeCallback::~CHIPTemperatureControlAttributeListAttributeCallback()
+CHIPDishwasherAlarmAttributeListAttributeCallback::~CHIPDishwasherAlarmAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23080,7 +25796,7 @@ CHIPTemperatureControlAttributeListAttributeCallback::~CHIPTemperatureControlAtt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPTemperatureControlAttributeListAttributeCallback::CallbackFn(
+void CHIPDishwasherAlarmAttributeListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -23090,9 +25806,9 @@ 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<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,
@@ -23122,9 +25838,9 @@ void CHIPTemperatureControlAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAlarmClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPMicrowaveOvenModeSupportedModesAttributeCallback::CHIPMicrowaveOvenModeSupportedModesAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPMicrowaveOvenModeClusterSupportedModesAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -23141,7 +25857,7 @@ CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::CHIPRefrigeratorAlar
     }
 }
 
-CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::~CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback()
+CHIPMicrowaveOvenModeSupportedModesAttributeCallback::~CHIPMicrowaveOvenModeSupportedModesAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23152,8 +25868,10 @@ CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::~CHIPRefrigeratorAla
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+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;
@@ -23162,8 +25880,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<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;
@@ -23182,11 +25900,85 @@ void CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::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);
+        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);
     }
 
@@ -23194,9 +25986,9 @@ void CHIPRefrigeratorAlarmGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback(
+CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback::CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAlarmClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPMicrowaveOvenModeClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -23213,7 +26005,7 @@ CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::CHIPRefrigeratorAlarm
     }
 }
 
-CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::~CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback()
+CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback::~CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23224,7 +26016,7 @@ CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::~CHIPRefrigeratorAlar
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -23234,8 +26026,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<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;
@@ -23266,9 +26058,10 @@ void CHIPRefrigeratorAlarmAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRefrigeratorAlarmEventListAttributeCallback::CHIPRefrigeratorAlarmEventListAttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAlarmClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback::CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPMicrowaveOvenModeClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23284,7 +26077,7 @@ CHIPRefrigeratorAlarmEventListAttributeCallback::CHIPRefrigeratorAlarmEventListA
     }
 }
 
-CHIPRefrigeratorAlarmEventListAttributeCallback::~CHIPRefrigeratorAlarmEventListAttributeCallback()
+CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback::~CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23295,8 +26088,8 @@ CHIPRefrigeratorAlarmEventListAttributeCallback::~CHIPRefrigeratorAlarmEventList
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAlarmEventListAttributeCallback::CallbackFn(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23305,8 +26098,8 @@ void CHIPRefrigeratorAlarmEventListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPRefrigeratorAlarmEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRefrigeratorAlarmEventListAttributeCallback *>(context), maybeDestroy);
+    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;
@@ -23337,9 +26130,9 @@ void CHIPRefrigeratorAlarmEventListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRefrigeratorAlarmAttributeListAttributeCallback::CHIPRefrigeratorAlarmAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPRefrigeratorAlarmClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPMicrowaveOvenModeEventListAttributeCallback::CHIPMicrowaveOvenModeEventListAttributeCallback(jobject javaCallback,
+                                                                                                 bool keepAlive) :
+    chip::Callback::Callback<CHIPMicrowaveOvenModeClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23355,7 +26148,7 @@ CHIPRefrigeratorAlarmAttributeListAttributeCallback::CHIPRefrigeratorAlarmAttrib
     }
 }
 
-CHIPRefrigeratorAlarmAttributeListAttributeCallback::~CHIPRefrigeratorAlarmAttributeListAttributeCallback()
+CHIPMicrowaveOvenModeEventListAttributeCallback::~CHIPMicrowaveOvenModeEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23366,8 +26159,8 @@ CHIPRefrigeratorAlarmAttributeListAttributeCallback::~CHIPRefrigeratorAlarmAttri
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRefrigeratorAlarmAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPMicrowaveOvenModeEventListAttributeCallback::CallbackFn(void * context,
+                                                                 const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23376,8 +26169,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<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;
@@ -23408,9 +26201,9 @@ void CHIPRefrigeratorAlarmAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDishwasherModeSupportedModesAttributeCallback::CHIPDishwasherModeSupportedModesAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherModeClusterSupportedModesAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPMicrowaveOvenModeAttributeListAttributeCallback::CHIPMicrowaveOvenModeAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                         bool keepAlive) :
+    chip::Callback::Callback<CHIPMicrowaveOvenModeClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23426,7 +26219,7 @@ CHIPDishwasherModeSupportedModesAttributeCallback::CHIPDishwasherModeSupportedMo
     }
 }
 
-CHIPDishwasherModeSupportedModesAttributeCallback::~CHIPDishwasherModeSupportedModesAttributeCallback()
+CHIPMicrowaveOvenModeAttributeListAttributeCallback::~CHIPMicrowaveOvenModeAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23437,9 +26230,8 @@ CHIPDishwasherModeSupportedModesAttributeCallback::~CHIPDishwasherModeSupportedM
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherModeSupportedModesAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::DishwasherMode::Structs::ModeOptionStruct::DecodableType> & list)
+void CHIPMicrowaveOvenModeAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23448,8 +26240,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<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;
@@ -23468,85 +26260,11 @@ void CHIPDishwasherModeSupportedModesAttributeCallback::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_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$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 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;
-        }
-
-        newElement_0 = env->NewObject(modeOptionStructStructClass_1, modeOptionStructStructCtor_1, newElement_0_label,
-                                      newElement_0_mode, newElement_0_modeTags);
+        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);
     }
 
@@ -23554,9 +26272,10 @@ void CHIPDishwasherModeSupportedModesAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDishwasherModeStartUpModeAttributeCallback::CHIPDishwasherModeStartUpModeAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherModeClusterStartUpModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback::CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPMicrowaveOvenControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23572,7 +26291,7 @@ CHIPDishwasherModeStartUpModeAttributeCallback::CHIPDishwasherModeStartUpModeAtt
     }
 }
 
-CHIPDishwasherModeStartUpModeAttributeCallback::~CHIPDishwasherModeStartUpModeAttributeCallback()
+CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback::~CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23583,8 +26302,8 @@ CHIPDishwasherModeStartUpModeAttributeCallback::~CHIPDishwasherModeStartUpModeAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherModeStartUpModeAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23592,8 +26311,9 @@ 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<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;
@@ -23601,28 +26321,33 @@ void CHIPDishwasherModeStartUpModeAttributeCallback::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);
 }
 
-CHIPDishwasherModeOnModeAttributeCallback::CHIPDishwasherModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherModeClusterOnModeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback::CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPMicrowaveOvenControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23638,7 +26363,7 @@ CHIPDishwasherModeOnModeAttributeCallback::CHIPDishwasherModeOnModeAttributeCall
     }
 }
 
-CHIPDishwasherModeOnModeAttributeCallback::~CHIPDishwasherModeOnModeAttributeCallback()
+CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback::~CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23649,7 +26374,8 @@ CHIPDishwasherModeOnModeAttributeCallback::~CHIPDishwasherModeOnModeAttributeCal
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherModeOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23657,8 +26383,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<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;
@@ -23666,30 +26393,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)
+CHIPMicrowaveOvenControlEventListAttributeCallback::CHIPMicrowaveOvenControlEventListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPMicrowaveOvenControlClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23705,7 +26434,7 @@ CHIPDishwasherModeGeneratedCommandListAttributeCallback::CHIPDishwasherModeGener
     }
 }
 
-CHIPDishwasherModeGeneratedCommandListAttributeCallback::~CHIPDishwasherModeGeneratedCommandListAttributeCallback()
+CHIPMicrowaveOvenControlEventListAttributeCallback::~CHIPMicrowaveOvenControlEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23716,8 +26445,8 @@ CHIPDishwasherModeGeneratedCommandListAttributeCallback::~CHIPDishwasherModeGene
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherModeGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPMicrowaveOvenControlEventListAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23726,8 +26455,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<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;
@@ -23758,9 +26487,9 @@ void CHIPDishwasherModeGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDishwasherModeAcceptedCommandListAttributeCallback::CHIPDishwasherModeAcceptedCommandListAttributeCallback(jobject javaCallback,
+CHIPMicrowaveOvenControlAttributeListAttributeCallback::CHIPMicrowaveOvenControlAttributeListAttributeCallback(jobject javaCallback,
                                                                                                                bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherModeClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPMicrowaveOvenControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -23777,7 +26506,7 @@ CHIPDishwasherModeAcceptedCommandListAttributeCallback::CHIPDishwasherModeAccept
     }
 }
 
-CHIPDishwasherModeAcceptedCommandListAttributeCallback::~CHIPDishwasherModeAcceptedCommandListAttributeCallback()
+CHIPMicrowaveOvenControlAttributeListAttributeCallback::~CHIPMicrowaveOvenControlAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23788,8 +26517,8 @@ CHIPDishwasherModeAcceptedCommandListAttributeCallback::~CHIPDishwasherModeAccep
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherModeAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPMicrowaveOvenControlAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23798,8 +26527,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<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;
@@ -23830,8 +26559,9 @@ void CHIPDishwasherModeAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDishwasherModeEventListAttributeCallback::CHIPDishwasherModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherModeClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPOperationalStatePhaseListAttributeCallback::CHIPOperationalStatePhaseListAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalStateClusterPhaseListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23847,7 +26577,7 @@ CHIPDishwasherModeEventListAttributeCallback::CHIPDishwasherModeEventListAttribu
     }
 }
 
-CHIPDishwasherModeEventListAttributeCallback::~CHIPDishwasherModeEventListAttributeCallback()
+CHIPOperationalStatePhaseListAttributeCallback::~CHIPOperationalStatePhaseListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23858,8 +26588,8 @@ CHIPDishwasherModeEventListAttributeCallback::~CHIPDishwasherModeEventListAttrib
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherModeEventListAttributeCallback::CallbackFn(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::EventId> & list)
+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;
@@ -23868,8 +26598,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<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;
@@ -23881,28 +26611,31 @@ void CHIPDishwasherModeEventListAttributeCallback::CallbackFn(void * context,
     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);
 }
 
-CHIPDishwasherModeAttributeListAttributeCallback::CHIPDishwasherModeAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                   bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherModeClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPOperationalStateCurrentPhaseAttributeCallback::CHIPOperationalStateCurrentPhaseAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalStateClusterCurrentPhaseAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23918,7 +26651,7 @@ CHIPDishwasherModeAttributeListAttributeCallback::CHIPDishwasherModeAttributeLis
     }
 }
 
-CHIPDishwasherModeAttributeListAttributeCallback::~CHIPDishwasherModeAttributeListAttributeCallback()
+CHIPOperationalStateCurrentPhaseAttributeCallback::~CHIPOperationalStateCurrentPhaseAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23929,8 +26662,8 @@ CHIPDishwasherModeAttributeListAttributeCallback::~CHIPDishwasherModeAttributeLi
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherModeAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPOperationalStateCurrentPhaseAttributeCallback::CallbackFn(void * context,
+                                                                   const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -23938,9 +26671,8 @@ void CHIPDishwasherModeAttributeListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     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<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;
@@ -23948,32 +26680,29 @@ void CHIPDishwasherModeAttributeListAttributeCallback::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);
 }
 
-CHIPAirQualityGeneratedCommandListAttributeCallback::CHIPAirQualityGeneratedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPAirQualityClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPOperationalStateCountdownTimeAttributeCallback::CHIPOperationalStateCountdownTimeAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalStateClusterCountdownTimeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -23989,7 +26718,7 @@ CHIPAirQualityGeneratedCommandListAttributeCallback::CHIPAirQualityGeneratedComm
     }
 }
 
-CHIPAirQualityGeneratedCommandListAttributeCallback::~CHIPAirQualityGeneratedCommandListAttributeCallback()
+CHIPOperationalStateCountdownTimeAttributeCallback::~CHIPOperationalStateCountdownTimeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24000,8 +26729,8 @@ CHIPAirQualityGeneratedCommandListAttributeCallback::~CHIPAirQualityGeneratedCom
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAirQualityGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPOperationalStateCountdownTimeAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24009,9 +26738,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<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;
@@ -24019,32 +26747,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/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);
 }
 
-CHIPAirQualityAcceptedCommandListAttributeCallback::CHIPAirQualityAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPAirQualityClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPOperationalStateOperationalStateListAttributeCallback::CHIPOperationalStateOperationalStateListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalStateClusterOperationalStateListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24060,7 +26786,7 @@ CHIPAirQualityAcceptedCommandListAttributeCallback::CHIPAirQualityAcceptedComman
     }
 }
 
-CHIPAirQualityAcceptedCommandListAttributeCallback::~CHIPAirQualityAcceptedCommandListAttributeCallback()
+CHIPOperationalStateOperationalStateListAttributeCallback::~CHIPOperationalStateOperationalStateListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24071,8 +26797,10 @@ CHIPAirQualityAcceptedCommandListAttributeCallback::~CHIPAirQualityAcceptedComma
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAirQualityAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+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;
@@ -24081,8 +26809,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<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;
@@ -24101,11 +26829,46 @@ void CHIPAirQualityAcceptedCommandListAttributeCallback::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);
+        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);
     }
 
@@ -24113,8 +26876,10 @@ void CHIPAirQualityAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPAirQualityEventListAttributeCallback::CHIPAirQualityEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPAirQualityClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPOperationalStateGeneratedCommandListAttributeCallback::CHIPOperationalStateGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalStateClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24130,7 +26895,7 @@ CHIPAirQualityEventListAttributeCallback::CHIPAirQualityEventListAttributeCallba
     }
 }
 
-CHIPAirQualityEventListAttributeCallback::~CHIPAirQualityEventListAttributeCallback()
+CHIPOperationalStateGeneratedCommandListAttributeCallback::~CHIPOperationalStateGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24141,8 +26906,8 @@ CHIPAirQualityEventListAttributeCallback::~CHIPAirQualityEventListAttributeCallb
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAirQualityEventListAttributeCallback::CallbackFn(void * context,
-                                                          const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPOperationalStateGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24151,8 +26916,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<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;
@@ -24183,8 +26948,10 @@ void CHIPAirQualityEventListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPAirQualityAttributeListAttributeCallback::CHIPAirQualityAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPAirQualityClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPOperationalStateAcceptedCommandListAttributeCallback::CHIPOperationalStateAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalStateClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24200,7 +26967,7 @@ CHIPAirQualityAttributeListAttributeCallback::CHIPAirQualityAttributeListAttribu
     }
 }
 
-CHIPAirQualityAttributeListAttributeCallback::~CHIPAirQualityAttributeListAttributeCallback()
+CHIPOperationalStateAcceptedCommandListAttributeCallback::~CHIPOperationalStateAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24211,8 +26978,8 @@ CHIPAirQualityAttributeListAttributeCallback::~CHIPAirQualityAttributeListAttrib
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPAirQualityAttributeListAttributeCallback::CallbackFn(void * context,
-                                                              const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPOperationalStateAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24221,8 +26988,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<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;
@@ -24253,10 +27020,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)
+CHIPOperationalStateEventListAttributeCallback::CHIPOperationalStateEventListAttributeCallback(jobject javaCallback,
+                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalStateClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24272,7 +27038,7 @@ CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback::CHIPSmokeCoAlarmGenerated
     }
 }
 
-CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback::~CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback()
+CHIPOperationalStateEventListAttributeCallback::~CHIPOperationalStateEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24283,8 +27049,8 @@ CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback::~CHIPSmokeCoAlarmGenerate
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPOperationalStateEventListAttributeCallback::CallbackFn(void * context,
+                                                                const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24293,8 +27059,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<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;
@@ -24325,10 +27091,9 @@ void CHIPSmokeCoAlarmGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPSmokeCoAlarmClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPOperationalStateAttributeListAttributeCallback::CHIPOperationalStateAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPOperationalStateClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24344,7 +27109,7 @@ CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::CHIPSmokeCoAlarmAcceptedCo
     }
 }
 
-CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::~CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback()
+CHIPOperationalStateAttributeListAttributeCallback::~CHIPOperationalStateAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24355,8 +27120,8 @@ CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::~CHIPSmokeCoAlarmAcceptedC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPOperationalStateAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24365,8 +27130,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<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;
@@ -24397,8 +27162,9 @@ void CHIPSmokeCoAlarmAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPSmokeCoAlarmEventListAttributeCallback::CHIPSmokeCoAlarmEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPSmokeCoAlarmClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRvcOperationalStatePhaseListAttributeCallback::CHIPRvcOperationalStatePhaseListAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcOperationalStateClusterPhaseListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24414,7 +27180,7 @@ CHIPSmokeCoAlarmEventListAttributeCallback::CHIPSmokeCoAlarmEventListAttributeCa
     }
 }
 
-CHIPSmokeCoAlarmEventListAttributeCallback::~CHIPSmokeCoAlarmEventListAttributeCallback()
+CHIPRvcOperationalStatePhaseListAttributeCallback::~CHIPRvcOperationalStatePhaseListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24425,8 +27191,8 @@ CHIPSmokeCoAlarmEventListAttributeCallback::~CHIPSmokeCoAlarmEventListAttributeC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPSmokeCoAlarmEventListAttributeCallback::CallbackFn(void * context,
-                                                            const chip::app::DataModel::DecodableList<chip::EventId> & list)
+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;
@@ -24435,8 +27201,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<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;
@@ -24448,28 +27214,32 @@ void CHIPSmokeCoAlarmEventListAttributeCallback::CallbackFn(void * context,
     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);
 }
 
-CHIPSmokeCoAlarmAttributeListAttributeCallback::CHIPSmokeCoAlarmAttributeListAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPSmokeCoAlarmClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRvcOperationalStateCurrentPhaseAttributeCallback::CHIPRvcOperationalStateCurrentPhaseAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcOperationalStateClusterCurrentPhaseAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24485,7 +27255,7 @@ CHIPSmokeCoAlarmAttributeListAttributeCallback::CHIPSmokeCoAlarmAttributeListAtt
     }
 }
 
-CHIPSmokeCoAlarmAttributeListAttributeCallback::~CHIPSmokeCoAlarmAttributeListAttributeCallback()
+CHIPRvcOperationalStateCurrentPhaseAttributeCallback::~CHIPRvcOperationalStateCurrentPhaseAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24496,8 +27266,8 @@ CHIPSmokeCoAlarmAttributeListAttributeCallback::~CHIPSmokeCoAlarmAttributeListAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPSmokeCoAlarmAttributeListAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPRvcOperationalStateCurrentPhaseAttributeCallback::CallbackFn(void * context,
+                                                                      const chip::app::DataModel::Nullable<uint8_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24505,9 +27275,8 @@ void CHIPSmokeCoAlarmAttributeListAttributeCallback::CallbackFn(void * context,
     jobject javaCallbackRef;
 
     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<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;
@@ -24515,32 +27284,29 @@ void CHIPSmokeCoAlarmAttributeListAttributeCallback::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/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);
 }
 
-CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::CHIPDishwasherAlarmGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherAlarmClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPRvcOperationalStateCountdownTimeAttributeCallback::CHIPRvcOperationalStateCountdownTimeAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcOperationalStateClusterCountdownTimeAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -24557,7 +27323,7 @@ CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::CHIPDishwasherAlarmGen
     }
 }
 
-CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::~CHIPDishwasherAlarmGeneratedCommandListAttributeCallback()
+CHIPRvcOperationalStateCountdownTimeAttributeCallback::~CHIPRvcOperationalStateCountdownTimeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24568,8 +27334,8 @@ CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::~CHIPDishwasherAlarmGe
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPRvcOperationalStateCountdownTimeAttributeCallback::CallbackFn(void * context,
+                                                                       const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24577,9 +27343,8 @@ void CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     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<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;
@@ -24587,32 +27352,29 @@ void CHIPDishwasherAlarmGeneratedCommandListAttributeCallback::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);
 }
 
-CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::CHIPDishwasherAlarmAcceptedCommandListAttributeCallback(
+CHIPRvcOperationalStateOperationalStateListAttributeCallback::CHIPRvcOperationalStateOperationalStateListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherAlarmClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPRvcOperationalStateClusterOperationalStateListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -24629,7 +27391,7 @@ CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::CHIPDishwasherAlarmAcce
     }
 }
 
-CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::~CHIPDishwasherAlarmAcceptedCommandListAttributeCallback()
+CHIPRvcOperationalStateOperationalStateListAttributeCallback::~CHIPRvcOperationalStateOperationalStateListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24640,8 +27402,10 @@ CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::~CHIPDishwasherAlarmAcc
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+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;
@@ -24650,8 +27414,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<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;
@@ -24670,11 +27434,46 @@ void CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::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);
+        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);
     }
 
@@ -24682,8 +27481,10 @@ void CHIPDishwasherAlarmAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPDishwasherAlarmEventListAttributeCallback::CHIPDishwasherAlarmEventListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPDishwasherAlarmClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::CHIPRvcOperationalStateGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcOperationalStateClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24699,7 +27500,7 @@ CHIPDishwasherAlarmEventListAttributeCallback::CHIPDishwasherAlarmEventListAttri
     }
 }
 
-CHIPDishwasherAlarmEventListAttributeCallback::~CHIPDishwasherAlarmEventListAttributeCallback()
+CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::~CHIPRvcOperationalStateGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24710,8 +27511,8 @@ CHIPDishwasherAlarmEventListAttributeCallback::~CHIPDishwasherAlarmEventListAttr
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherAlarmEventListAttributeCallback::CallbackFn(void * context,
-                                                               const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24720,8 +27521,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<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;
@@ -24752,9 +27553,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)
+CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::CHIPRvcOperationalStateAcceptedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcOperationalStateClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24770,7 +27572,7 @@ CHIPDishwasherAlarmAttributeListAttributeCallback::CHIPDishwasherAlarmAttributeL
     }
 }
 
-CHIPDishwasherAlarmAttributeListAttributeCallback::~CHIPDishwasherAlarmAttributeListAttributeCallback()
+CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::~CHIPRvcOperationalStateAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24781,8 +27583,8 @@ CHIPDishwasherAlarmAttributeListAttributeCallback::~CHIPDishwasherAlarmAttribute
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPDishwasherAlarmAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24791,8 +27593,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<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;
@@ -24823,10 +27625,9 @@ void CHIPDishwasherAlarmAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPMicrowaveOvenModeSupportedModesAttributeCallback::CHIPMicrowaveOvenModeSupportedModesAttributeCallback(jobject javaCallback,
-                                                                                                           bool keepAlive) :
-    chip::Callback::Callback<CHIPMicrowaveOvenModeClusterSupportedModesAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPRvcOperationalStateEventListAttributeCallback::CHIPRvcOperationalStateEventListAttributeCallback(jobject javaCallback,
+                                                                                                     bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcOperationalStateClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24842,7 +27643,7 @@ CHIPMicrowaveOvenModeSupportedModesAttributeCallback::CHIPMicrowaveOvenModeSuppo
     }
 }
 
-CHIPMicrowaveOvenModeSupportedModesAttributeCallback::~CHIPMicrowaveOvenModeSupportedModesAttributeCallback()
+CHIPRvcOperationalStateEventListAttributeCallback::~CHIPRvcOperationalStateEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -24853,10 +27654,8 @@ CHIPMicrowaveOvenModeSupportedModesAttributeCallback::~CHIPMicrowaveOvenModeSupp
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPMicrowaveOvenModeSupportedModesAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<chip::app::Clusters::MicrowaveOvenMode::Structs::ModeOptionStruct::DecodableType> &
-        list)
+void CHIPRvcOperationalStateEventListAttributeCallback::CallbackFn(void * context,
+                                                                   const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -24865,8 +27664,8 @@ void CHIPMicrowaveOvenModeSupportedModesAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPMicrowaveOvenModeSupportedModesAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMicrowaveOvenModeSupportedModesAttributeCallback *>(context), maybeDestroy);
+    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;
@@ -24885,85 +27684,11 @@ void CHIPMicrowaveOvenModeSupportedModesAttributeCallback::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_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);
+        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);
     }
 
@@ -24971,9 +27696,9 @@ void CHIPMicrowaveOvenModeSupportedModesAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback::CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPMicrowaveOvenModeClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPRvcOperationalStateAttributeListAttributeCallback::CHIPRvcOperationalStateAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                             bool keepAlive) :
+    chip::Callback::Callback<CHIPRvcOperationalStateClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -24990,7 +27715,7 @@ CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback::CHIPMicrowaveOvenMod
     }
 }
 
-CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback::~CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback()
+CHIPRvcOperationalStateAttributeListAttributeCallback::~CHIPRvcOperationalStateAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25001,8 +27726,8 @@ CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback::~CHIPMicrowaveOvenMo
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPRvcOperationalStateAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25011,8 +27736,8 @@ void CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    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;
@@ -25043,9 +27768,9 @@ void CHIPMicrowaveOvenModeGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback::CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback(
+CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback::CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPMicrowaveOvenModeClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterLastChangedTimeAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -25062,7 +27787,7 @@ CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback::CHIPMicrowaveOvenMode
     }
 }
 
-CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback::~CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback()
+CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback::~CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25073,8 +27798,8 @@ CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback::~CHIPMicrowaveOvenMod
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback::CallbackFn(void * context,
+                                                                          const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25082,9 +27807,8 @@ void CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    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;
@@ -25092,32 +27816,30 @@ void CHIPMicrowaveOvenModeAcceptedCommandListAttributeCallback::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);
 }
 
-CHIPMicrowaveOvenModeEventListAttributeCallback::CHIPMicrowaveOvenModeEventListAttributeCallback(jobject javaCallback,
-                                                                                                 bool keepAlive) :
-    chip::Callback::Callback<CHIPMicrowaveOvenModeClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPHepaFilterMonitoringReplacementProductListAttributeCallback::CHIPHepaFilterMonitoringReplacementProductListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterReplacementProductListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25133,7 +27855,7 @@ CHIPMicrowaveOvenModeEventListAttributeCallback::CHIPMicrowaveOvenModeEventListA
     }
 }
 
-CHIPMicrowaveOvenModeEventListAttributeCallback::~CHIPMicrowaveOvenModeEventListAttributeCallback()
+CHIPHepaFilterMonitoringReplacementProductListAttributeCallback::~CHIPHepaFilterMonitoringReplacementProductListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25144,8 +27866,10 @@ CHIPMicrowaveOvenModeEventListAttributeCallback::~CHIPMicrowaveOvenModeEventList
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPMicrowaveOvenModeEventListAttributeCallback::CallbackFn(void * context,
-                                                                 const chip::app::DataModel::DecodableList<chip::EventId> & list)
+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;
@@ -25154,8 +27878,8 @@ void CHIPMicrowaveOvenModeEventListAttributeCallback::CallbackFn(void * context,
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPMicrowaveOvenModeEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMicrowaveOvenModeEventListAttributeCallback *>(context), maybeDestroy);
+    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;
@@ -25174,11 +27898,36 @@ void CHIPMicrowaveOvenModeEventListAttributeCallback::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_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);
     }
 
@@ -25186,9 +27935,10 @@ void CHIPMicrowaveOvenModeEventListAttributeCallback::CallbackFn(void * context,
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPMicrowaveOvenModeAttributeListAttributeCallback::CHIPMicrowaveOvenModeAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                         bool keepAlive) :
-    chip::Callback::Callback<CHIPMicrowaveOvenModeClusterAttributeListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback::CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25204,7 +27954,7 @@ CHIPMicrowaveOvenModeAttributeListAttributeCallback::CHIPMicrowaveOvenModeAttrib
     }
 }
 
-CHIPMicrowaveOvenModeAttributeListAttributeCallback::~CHIPMicrowaveOvenModeAttributeListAttributeCallback()
+CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback::~CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25215,8 +27965,8 @@ CHIPMicrowaveOvenModeAttributeListAttributeCallback::~CHIPMicrowaveOvenModeAttri
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPMicrowaveOvenModeAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25225,8 +27975,8 @@ void CHIPMicrowaveOvenModeAttributeListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPMicrowaveOvenModeAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMicrowaveOvenModeAttributeListAttributeCallback *>(context), maybeDestroy);
+    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;
@@ -25257,9 +28007,9 @@ void CHIPMicrowaveOvenModeAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback::CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback(
+CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPMicrowaveOvenControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -25276,7 +28026,7 @@ CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback::CHIPMicrowaveOven
     }
 }
 
-CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback::~CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback()
+CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::~CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25287,7 +28037,7 @@ CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback::~CHIPMicrowaveOve
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -25297,8 +28047,8 @@ void CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback *>(context), maybeDestroy);
+    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;
@@ -25329,10 +28079,9 @@ void CHIPMicrowaveOvenControlGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback::CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPMicrowaveOvenControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
-    keepAlive(keepAlive)
+CHIPHepaFilterMonitoringEventListAttributeCallback::CHIPHepaFilterMonitoringEventListAttributeCallback(jobject javaCallback,
+                                                                                                       bool keepAlive) :
+    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25348,7 +28097,7 @@ CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback::CHIPMicrowaveOvenC
     }
 }
 
-CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback::~CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback()
+CHIPHepaFilterMonitoringEventListAttributeCallback::~CHIPHepaFilterMonitoringEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25359,8 +28108,8 @@ CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback::~CHIPMicrowaveOven
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPHepaFilterMonitoringEventListAttributeCallback::CallbackFn(void * context,
+                                                                    const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25369,8 +28118,8 @@ void CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback::CallbackFn(
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback *>(context), maybeDestroy);
+    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;
@@ -25401,9 +28150,10 @@ void CHIPMicrowaveOvenControlAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPMicrowaveOvenControlEventListAttributeCallback::CHIPMicrowaveOvenControlEventListAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPMicrowaveOvenControlClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPHepaFilterMonitoringAttributeListAttributeCallback::CHIPHepaFilterMonitoringAttributeListAttributeCallback(jobject javaCallback,
+                                                                                                               bool keepAlive) :
+    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25419,7 +28169,7 @@ CHIPMicrowaveOvenControlEventListAttributeCallback::CHIPMicrowaveOvenControlEven
     }
 }
 
-CHIPMicrowaveOvenControlEventListAttributeCallback::~CHIPMicrowaveOvenControlEventListAttributeCallback()
+CHIPHepaFilterMonitoringAttributeListAttributeCallback::~CHIPHepaFilterMonitoringAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25430,8 +28180,8 @@ CHIPMicrowaveOvenControlEventListAttributeCallback::~CHIPMicrowaveOvenControlEve
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPMicrowaveOvenControlEventListAttributeCallback::CallbackFn(void * context,
-                                                                    const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPHepaFilterMonitoringAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25440,8 +28190,8 @@ void CHIPMicrowaveOvenControlEventListAttributeCallback::CallbackFn(void * conte
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-    std::unique_ptr<CHIPMicrowaveOvenControlEventListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMicrowaveOvenControlEventListAttributeCallback *>(context), maybeDestroy);
+    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;
@@ -25472,9 +28222,9 @@ void CHIPMicrowaveOvenControlEventListAttributeCallback::CallbackFn(void * conte
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPMicrowaveOvenControlAttributeListAttributeCallback::CHIPMicrowaveOvenControlAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPMicrowaveOvenControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback::
+CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterLastChangedTimeAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -25491,7 +28241,8 @@ CHIPMicrowaveOvenControlAttributeListAttributeCallback::CHIPMicrowaveOvenControl
     }
 }
 
-CHIPMicrowaveOvenControlAttributeListAttributeCallback::~CHIPMicrowaveOvenControlAttributeListAttributeCallback()
+CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback::~
+CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25502,8 +28253,8 @@ CHIPMicrowaveOvenControlAttributeListAttributeCallback::~CHIPMicrowaveOvenContro
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPMicrowaveOvenControlAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25511,9 +28262,8 @@ void CHIPMicrowaveOvenControlAttributeListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-    std::unique_ptr<CHIPMicrowaveOvenControlAttributeListAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPMicrowaveOvenControlAttributeListAttributeCallback *>(context), maybeDestroy);
+    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;
@@ -25521,32 +28271,31 @@ void CHIPMicrowaveOvenControlAttributeListAttributeCallback::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);
 }
 
-CHIPOperationalStatePhaseListAttributeCallback::CHIPOperationalStatePhaseListAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterPhaseListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback::
+CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterReplacementProductListAttributeCallbackType>(CallbackFn,
+                                                                                                                    this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25562,7 +28311,8 @@ CHIPOperationalStatePhaseListAttributeCallback::CHIPOperationalStatePhaseListAtt
     }
 }
 
-CHIPOperationalStatePhaseListAttributeCallback::~CHIPOperationalStatePhaseListAttributeCallback()
+CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback::~
+CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25573,8 +28323,10 @@ CHIPOperationalStatePhaseListAttributeCallback::~CHIPOperationalStatePhaseListAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalStatePhaseListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>> & list)
+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;
@@ -25583,8 +28335,9 @@ 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<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;
@@ -25596,31 +28349,55 @@ 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);
+
+    auto iter_arrayListObj_0 = list.begin();
+    while (iter_arrayListObj_0.Next())
     {
-        chip::JniReferences::GetInstance().CreateArrayList(arrayListObj);
+        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));
 
-        auto iter_arrayListObj_1 = list.Value().begin();
-        while (iter_arrayListObj_1.Next())
+        jclass replacementProductStructStructClass_1;
+        err = chip::JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipStructs$ActivatedCarbonFilterMonitoringClusterReplacementProductStruct",
+            replacementProductStructStructClass_1);
+        if (err != CHIP_NO_ERROR)
         {
-            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);
+            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);
 }
 
-CHIPOperationalStateCurrentPhaseAttributeCallback::CHIPOperationalStateCurrentPhaseAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterCurrentPhaseAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::
+CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25636,7 +28413,8 @@ CHIPOperationalStateCurrentPhaseAttributeCallback::CHIPOperationalStateCurrentPh
     }
 }
 
-CHIPOperationalStateCurrentPhaseAttributeCallback::~CHIPOperationalStateCurrentPhaseAttributeCallback()
+CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::~
+CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25647,8 +28425,8 @@ CHIPOperationalStateCurrentPhaseAttributeCallback::~CHIPOperationalStateCurrentP
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalStateCurrentPhaseAttributeCallback::CallbackFn(void * context,
-                                                                   const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25656,8 +28434,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);
+
+    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;
@@ -25665,29 +28444,33 @@ void CHIPOperationalStateCurrentPhaseAttributeCallback::CallbackFn(void * contex
                    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);
 }
 
-CHIPOperationalStateCountdownTimeAttributeCallback::CHIPOperationalStateCountdownTimeAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterCountdownTimeAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback::
+CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25703,7 +28486,8 @@ CHIPOperationalStateCountdownTimeAttributeCallback::CHIPOperationalStateCountdow
     }
 }
 
-CHIPOperationalStateCountdownTimeAttributeCallback::~CHIPOperationalStateCountdownTimeAttributeCallback()
+CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback::~
+CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25714,8 +28498,8 @@ CHIPOperationalStateCountdownTimeAttributeCallback::~CHIPOperationalStateCountdo
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalStateCountdownTimeAttributeCallback::CallbackFn(void * context,
-                                                                    const chip::app::DataModel::Nullable<uint32_t> & value)
+void CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25723,8 +28507,9 @@ void CHIPOperationalStateCountdownTimeAttributeCallback::CallbackFn(void * conte
     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<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;
@@ -25732,29 +28517,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(
+CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterOperationalStateListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterEventListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -25771,7 +28559,7 @@ CHIPOperationalStateOperationalStateListAttributeCallback::CHIPOperationalStateO
     }
 }
 
-CHIPOperationalStateOperationalStateListAttributeCallback::~CHIPOperationalStateOperationalStateListAttributeCallback()
+CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::~CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25782,10 +28570,8 @@ CHIPOperationalStateOperationalStateListAttributeCallback::~CHIPOperationalState
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalStateOperationalStateListAttributeCallback::CallbackFn(
-    void * context,
-    const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::OperationalState::Structs::OperationalStateStruct::DecodableType> & list)
+void CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25794,8 +28580,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<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;
@@ -25814,46 +28600,11 @@ 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);
-        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);
+        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);
     }
 
@@ -25861,9 +28612,9 @@ void CHIPOperationalStateOperationalStateListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPOperationalStateGeneratedCommandListAttributeCallback::CHIPOperationalStateGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback::
+CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -25880,7 +28631,8 @@ CHIPOperationalStateGeneratedCommandListAttributeCallback::CHIPOperationalStateG
     }
 }
 
-CHIPOperationalStateGeneratedCommandListAttributeCallback::~CHIPOperationalStateGeneratedCommandListAttributeCallback()
+CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback::~
+CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25891,8 +28643,8 @@ CHIPOperationalStateGeneratedCommandListAttributeCallback::~CHIPOperationalState
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalStateGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -25901,8 +28653,8 @@ void CHIPOperationalStateGeneratedCommandListAttributeCallback::CallbackFn(
 
     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<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;
@@ -25933,9 +28685,9 @@ void CHIPOperationalStateGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPOperationalStateAcceptedCommandListAttributeCallback::CHIPOperationalStateAcceptedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPBooleanSensorConfigurationGeneratedCommandListAttributeCallback::
+CHIPBooleanSensorConfigurationGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPBooleanSensorConfigurationClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -25952,7 +28704,8 @@ CHIPOperationalStateAcceptedCommandListAttributeCallback::CHIPOperationalStateAc
     }
 }
 
-CHIPOperationalStateAcceptedCommandListAttributeCallback::~CHIPOperationalStateAcceptedCommandListAttributeCallback()
+CHIPBooleanSensorConfigurationGeneratedCommandListAttributeCallback::~
+CHIPBooleanSensorConfigurationGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -25963,7 +28716,7 @@ CHIPOperationalStateAcceptedCommandListAttributeCallback::~CHIPOperationalStateA
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalStateAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPBooleanSensorConfigurationGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -25973,8 +28726,8 @@ void CHIPOperationalStateAcceptedCommandListAttributeCallback::CallbackFn(
 
     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<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;
@@ -26005,9 +28758,10 @@ void CHIPOperationalStateAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPOperationalStateEventListAttributeCallback::CHIPOperationalStateEventListAttributeCallback(jobject javaCallback,
-                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPOperationalStateClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPBooleanSensorConfigurationAcceptedCommandListAttributeCallback::
+CHIPBooleanSensorConfigurationAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPBooleanSensorConfigurationClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26023,7 +28777,8 @@ CHIPOperationalStateEventListAttributeCallback::CHIPOperationalStateEventListAtt
     }
 }
 
-CHIPOperationalStateEventListAttributeCallback::~CHIPOperationalStateEventListAttributeCallback()
+CHIPBooleanSensorConfigurationAcceptedCommandListAttributeCallback::~
+CHIPBooleanSensorConfigurationAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26034,8 +28789,8 @@ CHIPOperationalStateEventListAttributeCallback::~CHIPOperationalStateEventListAt
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalStateEventListAttributeCallback::CallbackFn(void * context,
-                                                                const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPBooleanSensorConfigurationAcceptedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26044,8 +28799,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<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;
@@ -26076,9 +28831,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)
+CHIPBooleanSensorConfigurationEventListAttributeCallback::CHIPBooleanSensorConfigurationEventListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPBooleanSensorConfigurationClusterEventListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26094,7 +28850,7 @@ CHIPOperationalStateAttributeListAttributeCallback::CHIPOperationalStateAttribut
     }
 }
 
-CHIPOperationalStateAttributeListAttributeCallback::~CHIPOperationalStateAttributeListAttributeCallback()
+CHIPBooleanSensorConfigurationEventListAttributeCallback::~CHIPBooleanSensorConfigurationEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26105,8 +28861,8 @@ CHIPOperationalStateAttributeListAttributeCallback::~CHIPOperationalStateAttribu
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPOperationalStateAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPBooleanSensorConfigurationEventListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26115,8 +28871,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<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;
@@ -26147,9 +28903,10 @@ void CHIPOperationalStateAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPRvcOperationalStatePhaseListAttributeCallback::CHIPRvcOperationalStatePhaseListAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcOperationalStateClusterPhaseListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPBooleanSensorConfigurationAttributeListAttributeCallback::CHIPBooleanSensorConfigurationAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPBooleanSensorConfigurationClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26165,7 +28922,7 @@ CHIPRvcOperationalStatePhaseListAttributeCallback::CHIPRvcOperationalStatePhaseL
     }
 }
 
-CHIPRvcOperationalStatePhaseListAttributeCallback::~CHIPRvcOperationalStatePhaseListAttributeCallback()
+CHIPBooleanSensorConfigurationAttributeListAttributeCallback::~CHIPBooleanSensorConfigurationAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26176,8 +28933,8 @@ CHIPRvcOperationalStatePhaseListAttributeCallback::~CHIPRvcOperationalStatePhase
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcOperationalStatePhaseListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::DataModel::DecodableList<chip::CharSpan>> & list)
+void CHIPBooleanSensorConfigurationAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26186,8 +28943,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<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;
@@ -26199,31 +28956,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),
+CHIPValveConfigurationAndControlOpenDurationAttributeCallback::CHIPValveConfigurationAndControlOpenDurationAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterOpenDurationAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26240,7 +28994,7 @@ CHIPRvcOperationalStateCurrentPhaseAttributeCallback::CHIPRvcOperationalStateCur
     }
 }
 
-CHIPRvcOperationalStateCurrentPhaseAttributeCallback::~CHIPRvcOperationalStateCurrentPhaseAttributeCallback()
+CHIPValveConfigurationAndControlOpenDurationAttributeCallback::~CHIPValveConfigurationAndControlOpenDurationAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26251,8 +29005,8 @@ CHIPRvcOperationalStateCurrentPhaseAttributeCallback::~CHIPRvcOperationalStateCu
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcOperationalStateCurrentPhaseAttributeCallback::CallbackFn(void * context,
-                                                                      const chip::app::DataModel::Nullable<uint8_t> & value)
+void CHIPValveConfigurationAndControlOpenDurationAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26260,8 +29014,8 @@ 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<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;
@@ -26269,7 +29023,7 @@ 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/lang/Long;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -26279,19 +29033,19 @@ void CHIPRvcOperationalStateCurrentPhaseAttributeCallback::CallbackFn(void * con
     }
     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);
+        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);
 }
 
-CHIPRvcOperationalStateCountdownTimeAttributeCallback::CHIPRvcOperationalStateCountdownTimeAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcOperationalStateClusterCountdownTimeAttributeCallbackType>(CallbackFn, this),
+CHIPValveConfigurationAndControlAutoCloseTimeAttributeCallback::CHIPValveConfigurationAndControlAutoCloseTimeAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterAutoCloseTimeAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26308,7 +29062,7 @@ CHIPRvcOperationalStateCountdownTimeAttributeCallback::CHIPRvcOperationalStateCo
     }
 }
 
-CHIPRvcOperationalStateCountdownTimeAttributeCallback::~CHIPRvcOperationalStateCountdownTimeAttributeCallback()
+CHIPValveConfigurationAndControlAutoCloseTimeAttributeCallback::~CHIPValveConfigurationAndControlAutoCloseTimeAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26319,17 +29073,17 @@ CHIPRvcOperationalStateCountdownTimeAttributeCallback::~CHIPRvcOperationalStateC
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcOperationalStateCountdownTimeAttributeCallback::CallbackFn(void * context,
-                                                                       const chip::app::DataModel::Nullable<uint32_t> & value)
+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<CHIPRvcOperationalStateCountdownTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPRvcOperationalStateCountdownTimeAttributeCallback *>(context), maybeDestroy);
+    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;
@@ -26357,9 +29111,9 @@ void CHIPRvcOperationalStateCountdownTimeAttributeCallback::CallbackFn(void * co
     env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
 }
 
-CHIPRvcOperationalStateOperationalStateListAttributeCallback::CHIPRvcOperationalStateOperationalStateListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcOperationalStateClusterOperationalStateListAttributeCallbackType>(CallbackFn, this),
+CHIPValveConfigurationAndControlRemainingDurationAttributeCallback::
+CHIPValveConfigurationAndControlRemainingDurationAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterRemainingDurationAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26376,7 +29130,8 @@ CHIPRvcOperationalStateOperationalStateListAttributeCallback::CHIPRvcOperational
     }
 }
 
-CHIPRvcOperationalStateOperationalStateListAttributeCallback::~CHIPRvcOperationalStateOperationalStateListAttributeCallback()
+CHIPValveConfigurationAndControlRemainingDurationAttributeCallback::~
+CHIPValveConfigurationAndControlRemainingDurationAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26387,10 +29142,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 CHIPValveConfigurationAndControlRemainingDurationAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<uint32_t> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26398,9 +29151,8 @@ void CHIPRvcOperationalStateOperationalStateListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     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<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;
@@ -26408,67 +29160,29 @@ void CHIPRvcOperationalStateOperationalStateListAttributeCallback::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;
-        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);
+        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);
 }
 
-CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::CHIPRvcOperationalStateGeneratedCommandListAttributeCallback(
+CHIPValveConfigurationAndControlCurrentStateAttributeCallback::CHIPValveConfigurationAndControlCurrentStateAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcOperationalStateClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterCurrentStateAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26485,7 +29199,7 @@ CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::CHIPRvcOperational
     }
 }
 
-CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::~CHIPRvcOperationalStateGeneratedCommandListAttributeCallback()
+CHIPValveConfigurationAndControlCurrentStateAttributeCallback::~CHIPValveConfigurationAndControlCurrentStateAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26496,8 +29210,8 @@ CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::~CHIPRvcOperationa
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+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;
@@ -26505,9 +29219,8 @@ void CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     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<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;
@@ -26515,32 +29228,29 @@ void CHIPRvcOperationalStateGeneratedCommandListAttributeCallback::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);
 }
 
-CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::CHIPRvcOperationalStateAcceptedCommandListAttributeCallback(
+CHIPValveConfigurationAndControlTargetStateAttributeCallback::CHIPValveConfigurationAndControlTargetStateAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcOperationalStateClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterTargetStateAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26557,7 +29267,7 @@ CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::CHIPRvcOperationalS
     }
 }
 
-CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::~CHIPRvcOperationalStateAcceptedCommandListAttributeCallback()
+CHIPValveConfigurationAndControlTargetStateAttributeCallback::~CHIPValveConfigurationAndControlTargetStateAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26568,8 +29278,8 @@ CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::~CHIPRvcOperational
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+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;
@@ -26577,9 +29287,8 @@ void CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     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<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;
@@ -26587,32 +29296,30 @@ void CHIPRvcOperationalStateAcceptedCommandListAttributeCallback::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);
 }
 
-CHIPRvcOperationalStateEventListAttributeCallback::CHIPRvcOperationalStateEventListAttributeCallback(jobject javaCallback,
-                                                                                                     bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcOperationalStateClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPValveConfigurationAndControlCurrentLevelAttributeCallback::CHIPValveConfigurationAndControlCurrentLevelAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterCurrentLevelAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26628,7 +29335,7 @@ CHIPRvcOperationalStateEventListAttributeCallback::CHIPRvcOperationalStateEventL
     }
 }
 
-CHIPRvcOperationalStateEventListAttributeCallback::~CHIPRvcOperationalStateEventListAttributeCallback()
+CHIPValveConfigurationAndControlCurrentLevelAttributeCallback::~CHIPValveConfigurationAndControlCurrentLevelAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26639,8 +29346,8 @@ CHIPRvcOperationalStateEventListAttributeCallback::~CHIPRvcOperationalStateEvent
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcOperationalStateEventListAttributeCallback::CallbackFn(void * context,
-                                                                   const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPValveConfigurationAndControlCurrentLevelAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::Percent> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26648,9 +29355,8 @@ void CHIPRvcOperationalStateEventListAttributeCallback::CallbackFn(void * contex
     jobject javaCallbackRef;
 
     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<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;
@@ -26658,32 +29364,29 @@ void CHIPRvcOperationalStateEventListAttributeCallback::CallbackFn(void * contex
                    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);
 }
 
-CHIPRvcOperationalStateAttributeListAttributeCallback::CHIPRvcOperationalStateAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                             bool keepAlive) :
-    chip::Callback::Callback<CHIPRvcOperationalStateClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPValveConfigurationAndControlTargetLevelAttributeCallback::CHIPValveConfigurationAndControlTargetLevelAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterTargetLevelAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26700,7 +29403,7 @@ CHIPRvcOperationalStateAttributeListAttributeCallback::CHIPRvcOperationalStateAt
     }
 }
 
-CHIPRvcOperationalStateAttributeListAttributeCallback::~CHIPRvcOperationalStateAttributeListAttributeCallback()
+CHIPValveConfigurationAndControlTargetLevelAttributeCallback::~CHIPValveConfigurationAndControlTargetLevelAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26711,8 +29414,8 @@ CHIPRvcOperationalStateAttributeListAttributeCallback::~CHIPRvcOperationalStateA
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPRvcOperationalStateAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+void CHIPValveConfigurationAndControlTargetLevelAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::Percent> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26720,9 +29423,8 @@ void CHIPRvcOperationalStateAttributeListAttributeCallback::CallbackFn(
     jobject javaCallbackRef;
 
     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<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;
@@ -26730,32 +29432,29 @@ void CHIPRvcOperationalStateAttributeListAttributeCallback::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);
 }
 
-CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback::CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback(
+CHIPValveConfigurationAndControlOpenLevelAttributeCallback::CHIPValveConfigurationAndControlOpenLevelAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterLastChangedTimeAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterOpenLevelAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26772,7 +29471,7 @@ CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback::CHIPHepaFilterMonitori
     }
 }
 
-CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback::~CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback()
+CHIPValveConfigurationAndControlOpenLevelAttributeCallback::~CHIPValveConfigurationAndControlOpenLevelAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26783,8 +29482,8 @@ CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback::~CHIPHepaFilterMonitor
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback::CallbackFn(void * context,
-                                                                          const chip::app::DataModel::Nullable<uint32_t> & value)
+void CHIPValveConfigurationAndControlOpenLevelAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::Nullable<chip::Percent> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26792,8 +29491,8 @@ 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<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;
@@ -26801,7 +29500,7 @@ 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/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
     jobject javaValue;
@@ -26811,19 +29510,19 @@ void CHIPHepaFilterMonitoringLastChangedTimeAttributeCallback::CallbackFn(void *
     }
     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);
+        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);
 }
 
-CHIPHepaFilterMonitoringReplacementProductListAttributeCallback::CHIPHepaFilterMonitoringReplacementProductListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterReplacementProductListAttributeCallbackType>(CallbackFn, this),
+CHIPValveConfigurationAndControlGeneratedCommandListAttributeCallback::
+CHIPValveConfigurationAndControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26840,7 +29539,8 @@ CHIPHepaFilterMonitoringReplacementProductListAttributeCallback::CHIPHepaFilterM
     }
 }
 
-CHIPHepaFilterMonitoringReplacementProductListAttributeCallback::~CHIPHepaFilterMonitoringReplacementProductListAttributeCallback()
+CHIPValveConfigurationAndControlGeneratedCommandListAttributeCallback::~
+CHIPValveConfigurationAndControlGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26851,10 +29551,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 CHIPValveConfigurationAndControlGeneratedCommandListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26863,8 +29561,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<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;
@@ -26883,36 +29581,11 @@ 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));
-
-        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);
+        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);
     }
 
@@ -26920,9 +29593,9 @@ void CHIPHepaFilterMonitoringReplacementProductListAttributeCallback::CallbackFn
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback::CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback(
-    jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPValveConfigurationAndControlAcceptedCommandListAttributeCallback::
+CHIPValveConfigurationAndControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -26939,7 +29612,8 @@ CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback::CHIPHepaFilterMon
     }
 }
 
-CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback::~CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback()
+CHIPValveConfigurationAndControlAcceptedCommandListAttributeCallback::~
+CHIPValveConfigurationAndControlAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -26950,7 +29624,7 @@ CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback::~CHIPHepaFilterMo
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPValveConfigurationAndControlAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -26960,8 +29634,8 @@ 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<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;
@@ -26992,9 +29666,9 @@ void CHIPHepaFilterMonitoringGeneratedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback(
+CHIPValveConfigurationAndControlEventListAttributeCallback::CHIPValveConfigurationAndControlEventListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterEventListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -27011,7 +29685,7 @@ CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::CHIPHepaFilterMoni
     }
 }
 
-CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::~CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback()
+CHIPValveConfigurationAndControlEventListAttributeCallback::~CHIPValveConfigurationAndControlEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27022,8 +29696,8 @@ CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::~CHIPHepaFilterMon
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
+void CHIPValveConfigurationAndControlEventListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -27032,8 +29706,8 @@ void CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::CallbackFn(
 
     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<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;
@@ -27064,9 +29738,10 @@ void CHIPHepaFilterMonitoringAcceptedCommandListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPHepaFilterMonitoringEventListAttributeCallback::CHIPHepaFilterMonitoringEventListAttributeCallback(jobject javaCallback,
-                                                                                                       bool keepAlive) :
-    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterEventListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive)
+CHIPValveConfigurationAndControlAttributeListAttributeCallback::CHIPValveConfigurationAndControlAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPValveConfigurationAndControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+    keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27082,7 +29757,7 @@ CHIPHepaFilterMonitoringEventListAttributeCallback::CHIPHepaFilterMonitoringEven
     }
 }
 
-CHIPHepaFilterMonitoringEventListAttributeCallback::~CHIPHepaFilterMonitoringEventListAttributeCallback()
+CHIPValveConfigurationAndControlAttributeListAttributeCallback::~CHIPValveConfigurationAndControlAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27093,8 +29768,8 @@ CHIPHepaFilterMonitoringEventListAttributeCallback::~CHIPHepaFilterMonitoringEve
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPHepaFilterMonitoringEventListAttributeCallback::CallbackFn(void * context,
-                                                                    const chip::app::DataModel::DecodableList<chip::EventId> & list)
+void CHIPValveConfigurationAndControlAttributeListAttributeCallback::CallbackFn(
+    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -27103,8 +29778,8 @@ void CHIPHepaFilterMonitoringEventListAttributeCallback::CallbackFn(void * conte
 
     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<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;
@@ -27135,9 +29810,9 @@ void CHIPHepaFilterMonitoringEventListAttributeCallback::CallbackFn(void * conte
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPHepaFilterMonitoringAttributeListAttributeCallback::CHIPHepaFilterMonitoringAttributeListAttributeCallback(jobject javaCallback,
-                                                                                                               bool keepAlive) :
-    chip::Callback::Callback<CHIPHepaFilterMonitoringClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPDemandResponseLoadControlLoadControlProgramsAttributeCallback::
+CHIPDemandResponseLoadControlLoadControlProgramsAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDemandResponseLoadControlClusterLoadControlProgramsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -27154,7 +29829,8 @@ CHIPHepaFilterMonitoringAttributeListAttributeCallback::CHIPHepaFilterMonitoring
     }
 }
 
-CHIPHepaFilterMonitoringAttributeListAttributeCallback::~CHIPHepaFilterMonitoringAttributeListAttributeCallback()
+CHIPDemandResponseLoadControlLoadControlProgramsAttributeCallback::~
+CHIPDemandResponseLoadControlLoadControlProgramsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27165,8 +29841,10 @@ CHIPHepaFilterMonitoringAttributeListAttributeCallback::~CHIPHepaFilterMonitorin
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPHepaFilterMonitoringAttributeListAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
+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;
@@ -27175,8 +29853,8 @@ void CHIPHepaFilterMonitoringAttributeListAttributeCallback::CallbackFn(
 
     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<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;
@@ -27195,11 +29873,77 @@ void CHIPHepaFilterMonitoringAttributeListAttributeCallback::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);
+        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);
     }
 
@@ -27207,9 +29951,9 @@ void CHIPHepaFilterMonitoringAttributeListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback::
-CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterLastChangedTimeAttributeCallbackType>(CallbackFn, this),
+CHIPDemandResponseLoadControlEventsAttributeCallback::CHIPDemandResponseLoadControlEventsAttributeCallback(jobject javaCallback,
+                                                                                                           bool keepAlive) :
+    chip::Callback::Callback<CHIPDemandResponseLoadControlClusterEventsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -27226,8 +29970,7 @@ CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback(jobject java
     }
 }
 
-CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback::~
-CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback()
+CHIPDemandResponseLoadControlEventsAttributeCallback::~CHIPDemandResponseLoadControlEventsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27238,48 +29981,526 @@ CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback()
     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;
+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);
+            }
 
-    VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-    std::unique_ptr<CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-        reinterpret_cast<CHIPActivatedCarbonFilterMonitoringLastChangedTimeAttributeCallback *>(context), maybeDestroy);
+            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;
+            }
 
-    // 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"));
+            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);
+        }
 
-    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"));
+        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;
+        }
 
-    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);
+        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->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+    env->ExceptionClear();
+    env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback::
-CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterReplacementProductListAttributeCallbackType>(CallbackFn,
-                                                                                                                    this),
+CHIPDemandResponseLoadControlActiveEventsAttributeCallback::CHIPDemandResponseLoadControlActiveEventsAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDemandResponseLoadControlClusterActiveEventsAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -27296,8 +30517,7 @@ CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback(jobje
     }
 }
 
-CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback::~
-CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback()
+CHIPDemandResponseLoadControlActiveEventsAttributeCallback::~CHIPDemandResponseLoadControlActiveEventsAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27308,10 +30528,10 @@ CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback::CallbackFn(
+void CHIPDemandResponseLoadControlActiveEventsAttributeCallback::CallbackFn(
     void * context,
     const chip::app::DataModel::DecodableList<
-        chip::app::Clusters::ActivatedCarbonFilterMonitoring::Structs::ReplacementProductStruct::DecodableType> & list)
+        chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::DecodableType> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -27320,9 +30540,8 @@ void CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback:
 
     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<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;
@@ -27341,37 +30560,484 @@ void CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback:
     {
         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));
+        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);
 
-        jclass replacementProductStructStructClass_1;
+        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$ActivatedCarbonFilterMonitoringClusterReplacementProductStruct",
-            replacementProductStructStructClass_1);
+            env, "chip/devicecontroller/ChipStructs$DemandResponseLoadControlClusterLoadControlEventStruct",
+            loadControlEventStructStructClass_1);
         if (err != CHIP_NO_ERROR)
         {
-            ChipLogError(Zcl, "Could not find class ChipStructs$ActivatedCarbonFilterMonitoringClusterReplacementProductStruct");
+            ChipLogError(Zcl, "Could not find class ChipStructs$DemandResponseLoadControlClusterLoadControlEventStruct");
             return;
         }
-        jmethodID replacementProductStructStructCtor_1 =
-            env->GetMethodID(replacementProductStructStructClass_1, "<init>", "(Ljava/lang/Integer;Ljava/lang/String;)V");
-        if (replacementProductStructStructCtor_1 == 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$ActivatedCarbonFilterMonitoringClusterReplacementProductStruct constructor");
+            ChipLogError(Zcl, "Could not find ChipStructs$DemandResponseLoadControlClusterLoadControlEventStruct constructor");
             return;
         }
 
-        newElement_0 = env->NewObject(replacementProductStructStructClass_1, replacementProductStructStructCtor_1,
-                                      newElement_0_productIdentifierType, newElement_0_productIdentifierValue);
+        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);
     }
 
@@ -27379,9 +31045,9 @@ void CHIPActivatedCarbonFilterMonitoringReplacementProductListAttributeCallback:
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::
-CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPDemandResponseLoadControlGeneratedCommandListAttributeCallback::
+CHIPDemandResponseLoadControlGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDemandResponseLoadControlClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -27398,8 +31064,8 @@ CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback(jobject
     }
 }
 
-CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::~
-CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback()
+CHIPDemandResponseLoadControlGeneratedCommandListAttributeCallback::~
+CHIPDemandResponseLoadControlGeneratedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27410,7 +31076,7 @@ CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::CallbackFn(
+void CHIPDemandResponseLoadControlGeneratedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -27420,8 +31086,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<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;
@@ -27452,9 +31118,9 @@ void CHIPActivatedCarbonFilterMonitoringGeneratedCommandListAttributeCallback::C
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback::
-CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
+CHIPDemandResponseLoadControlAcceptedCommandListAttributeCallback::
+CHIPDemandResponseLoadControlAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDemandResponseLoadControlClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -27471,8 +31137,8 @@ CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback(jobject
     }
 }
 
-CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback::~
-CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback()
+CHIPDemandResponseLoadControlAcceptedCommandListAttributeCallback::~
+CHIPDemandResponseLoadControlAcceptedCommandListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27483,7 +31149,7 @@ CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback::CallbackFn(
+void CHIPDemandResponseLoadControlAcceptedCommandListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -27493,8 +31159,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<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;
@@ -27525,9 +31191,9 @@ void CHIPActivatedCarbonFilterMonitoringAcceptedCommandListAttributeCallback::Ca
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback(
+CHIPDemandResponseLoadControlEventListAttributeCallback::CHIPDemandResponseLoadControlEventListAttributeCallback(
     jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterEventListAttributeCallbackType>(CallbackFn, this),
+    chip::Callback::Callback<CHIPDemandResponseLoadControlClusterEventListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -27544,7 +31210,7 @@ CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::CHIPActivatedCarb
     }
 }
 
-CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::~CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback()
+CHIPDemandResponseLoadControlEventListAttributeCallback::~CHIPDemandResponseLoadControlEventListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27555,7 +31221,7 @@ CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::~CHIPActivatedCar
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::CallbackFn(
+void CHIPDemandResponseLoadControlEventListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::EventId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -27565,8 +31231,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<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;
@@ -27597,9 +31263,9 @@ void CHIPActivatedCarbonFilterMonitoringEventListAttributeCallback::CallbackFn(
     env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
 }
 
-CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback::
-CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) :
-    chip::Callback::Callback<CHIPActivatedCarbonFilterMonitoringClusterAttributeListAttributeCallbackType>(CallbackFn, this),
+CHIPDemandResponseLoadControlAttributeListAttributeCallback::CHIPDemandResponseLoadControlAttributeListAttributeCallback(
+    jobject javaCallback, bool keepAlive) :
+    chip::Callback::Callback<CHIPDemandResponseLoadControlClusterAttributeListAttributeCallbackType>(CallbackFn, this),
     keepAlive(keepAlive)
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
@@ -27616,8 +31282,7 @@ CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback(jobject javaCa
     }
 }
 
-CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback::~
-CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback()
+CHIPDemandResponseLoadControlAttributeListAttributeCallback::~CHIPDemandResponseLoadControlAttributeListAttributeCallback()
 {
     JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
     if (env == nullptr)
@@ -27628,7 +31293,7 @@ CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback()
     env->DeleteGlobalRef(javaCallbackRef);
 }
 
-void CHIPActivatedCarbonFilterMonitoringAttributeListAttributeCallback::CallbackFn(
+void CHIPDemandResponseLoadControlAttributeListAttributeCallback::CallbackFn(
     void * context, const chip::app::DataModel::DecodableList<chip::AttributeId> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
@@ -27638,8 +31303,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<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;
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/chip/ChipDeviceCtrl.py b/src/controller/python/chip/ChipDeviceCtrl.py
index f30cc711b9a7cb..d6e8faa1742317 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.
@@ -894,7 +897,7 @@ async def WriteAttribute(self, nodeid: int,
             to the XYZ attribute on the test cluster to endpoint 1
 
         Returns:
-            - PyChipError
+            - [PyChipError] (list - one for each pth)
         '''
         self.CheckIsActive()
 
@@ -1198,10 +1201,10 @@ async def ReadAttribute(self, nodeid: int, attributes: typing.List[typing.Union[
             - 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])
+                            (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 0
-                            ret[0][Clusters.OnOff][Clusters.OnOff.Attributes.OnTime]
+                            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
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
index ae930bb6cad987..3642708c0339d2 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: {
@@ -4316,6 +4339,172 @@ class ChipClusters:
             },
         },
     }
+    _TIMER_CLUSTER_INFO = {
+        "clusterName": "Timer",
+        "clusterId": 0x00000047,
+        "commands": {
+            0x00000000: {
+                "commandId": 0x00000000,
+                "commandName": "SetTimer",
+                "args": {
+                    "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": "SetTime",
+                "attributeId": 0x00000000,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000001: {
+                "attributeName": "TimeRemaining",
+                "attributeId": 0x00000001,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000002: {
+                "attributeName": "TimerState",
+                "attributeId": 0x00000002,
+                "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,
+            },
+        },
+    }
+    _OVEN_MODE_CLUSTER_INFO = {
+        "clusterName": "OvenMode",
+        "clusterId": 0x00000049,
+        "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,
+            },
+        },
+    }
     _MODE_SELECT_CLUSTER_INFO = {
         "clusterName": "ModeSelect",
         "clusterId": 0x00000050,
@@ -5785,6 +5974,346 @@ class ChipClusters:
             },
         },
     }
+    _BOOLEAN_SENSOR_CONFIGURATION_CLUSTER_INFO = {
+        "clusterName": "BooleanSensorConfiguration",
+        "clusterId": 0x00000080,
+        "commands": {
+            0x00000000: {
+                "commandId": 0x00000000,
+                "commandName": "SuppressRequest",
+                "args": {
+                    "alarmsToSuppress": "int",
+                },
+            },
+        },
+        "attributes": {
+            0x00000000: {
+                "attributeName": "SensitivityLevel",
+                "attributeId": 0x00000000,
+                "type": "int",
+                "reportable": True,
+                "writable": True,
+            },
+            0x00000001: {
+                "attributeName": "AlarmsActive",
+                "attributeId": 0x00000001,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000002: {
+                "attributeName": "AlarmsSuppressed",
+                "attributeId": 0x00000002,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000003: {
+                "attributeName": "AlarmsEnabled",
+                "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,
+            },
+        },
+    }
+    _VALVE_CONFIGURATION_AND_CONTROL_CLUSTER_INFO = {
+        "clusterName": "ValveConfigurationAndControl",
+        "clusterId": 0x00000081,
+        "commands": {
+            0x00000000: {
+                "commandId": 0x00000000,
+                "commandName": "Open",
+                "args": {
+                    "openDuration": "int",
+                },
+            },
+            0x00000001: {
+                "commandId": 0x00000001,
+                "commandName": "Close",
+                "args": {
+                },
+            },
+            0x00000002: {
+                "commandId": 0x00000002,
+                "commandName": "SetLevel",
+                "args": {
+                    "level": "int",
+                    "openDuration": "int",
+                },
+            },
+        },
+        "attributes": {
+            0x00000000: {
+                "attributeName": "OpenDuration",
+                "attributeId": 0x00000000,
+                "type": "int",
+                "reportable": True,
+                "writable": True,
+            },
+            0x00000001: {
+                "attributeName": "AutoCloseTime",
+                "attributeId": 0x00000001,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000002: {
+                "attributeName": "RemainingDuration",
+                "attributeId": 0x00000002,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000003: {
+                "attributeName": "CurrentState",
+                "attributeId": 0x00000003,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000004: {
+                "attributeName": "TargetState",
+                "attributeId": 0x00000004,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000005: {
+                "attributeName": "StartUpState",
+                "attributeId": 0x00000005,
+                "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: {
+                "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,
+            },
+        },
+    }
+    _DEMAND_RESPONSE_LOAD_CONTROL_CLUSTER_INFO = {
+        "clusterName": "DemandResponseLoadControl",
+        "clusterId": 0x00000096,
+        "commands": {
+            0x00000000: {
+                "commandId": 0x00000000,
+                "commandName": "RegisterLoadControlProgramRequest",
+                "args": {
+                    "loadControlProgram": "LoadControlProgramStruct",
+                },
+            },
+            0x00000001: {
+                "commandId": 0x00000001,
+                "commandName": "UnregisterLoadControlProgramRequest",
+                "args": {
+                    "loadControlProgramID": "bytes",
+                },
+            },
+            0x00000002: {
+                "commandId": 0x00000002,
+                "commandName": "AddLoadControlEventRequest",
+                "args": {
+                    "event": "LoadControlEventStruct",
+                },
+            },
+            0x00000003: {
+                "commandId": 0x00000003,
+                "commandName": "RemoveLoadControlEventRequest",
+                "args": {
+                    "eventID": "bytes",
+                    "cancelControl": "int",
+                },
+            },
+            0x00000004: {
+                "commandId": 0x00000004,
+                "commandName": "ClearLoadControlEventsRequest",
+                "args": {
+                },
+            },
+        },
+        "attributes": {
+            0x00000000: {
+                "attributeName": "DeviceClass",
+                "attributeId": 0x00000000,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000001: {
+                "attributeName": "LoadControlPrograms",
+                "attributeId": 0x00000001,
+                "type": "",
+                "reportable": True,
+            },
+            0x00000002: {
+                "attributeName": "NumberOfLoadControlPrograms",
+                "attributeId": 0x00000002,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000003: {
+                "attributeName": "Events",
+                "attributeId": 0x00000003,
+                "type": "",
+                "reportable": True,
+            },
+            0x00000004: {
+                "attributeName": "ActiveEvents",
+                "attributeId": 0x00000004,
+                "type": "",
+                "reportable": True,
+            },
+            0x00000005: {
+                "attributeName": "NumberOfEventsPerProgram",
+                "attributeId": 0x00000005,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000006: {
+                "attributeName": "NumberOfTransistions",
+                "attributeId": 0x00000006,
+                "type": "int",
+                "reportable": True,
+            },
+            0x00000007: {
+                "attributeName": "DefaultRandomStart",
+                "attributeId": 0x00000007,
+                "type": "int",
+                "reportable": True,
+                "writable": True,
+            },
+            0x00000008: {
+                "attributeName": "DefaultRandomDuration",
+                "attributeId": 0x00000008,
+                "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,
+            },
+        },
+    }
     _DOOR_LOCK_CLUSTER_INFO = {
         "clusterName": "DoorLock",
         "clusterId": 0x00000101,
@@ -9674,6 +10203,12 @@ class ChipClusters:
                 "type": "str",
                 "reportable": True,
             },
+            0x00000001: {
+                "attributeName": "LinkLocalAddress",
+                "attributeId": 0x00000001,
+                "type": "bytes",
+                "reportable": True,
+            },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
                 "attributeId": 0x0000FFF8,
@@ -10234,7 +10769,6 @@ class ChipClusters:
                 "attributeId": 0x00000001,
                 "type": "int",
                 "reportable": True,
-                "writable": True,
             },
             0x0000FFF8: {
                 "attributeName": "GeneratedCommandList",
@@ -12374,6 +12908,8 @@ class ChipClusters:
         0x00000044: _PROXY_VALID_CLUSTER_INFO,
         0x00000045: _BOOLEAN_STATE_CLUSTER_INFO,
         0x00000046: _ICD_MANAGEMENT_CLUSTER_INFO,
+        0x00000047: _TIMER_CLUSTER_INFO,
+        0x00000049: _OVEN_MODE_CLUSTER_INFO,
         0x00000050: _MODE_SELECT_CLUSTER_INFO,
         0x00000051: _LAUNDRY_WASHER_MODE_CLUSTER_INFO,
         0x00000052: _REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER_INFO,
@@ -12392,6 +12928,9 @@ class ChipClusters:
         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,
         0x00000101: _DOOR_LOCK_CLUSTER_INFO,
         0x00000102: _WINDOW_COVERING_CLUSTER_INFO,
         0x00000103: _BARRIER_CONTROL_CLUSTER_INFO,
@@ -12477,6 +13016,8 @@ class ChipClusters:
         "ProxyValid": _PROXY_VALID_CLUSTER_INFO,
         "BooleanState": _BOOLEAN_STATE_CLUSTER_INFO,
         "IcdManagement": _ICD_MANAGEMENT_CLUSTER_INFO,
+        "Timer": _TIMER_CLUSTER_INFO,
+        "OvenMode": _OVEN_MODE_CLUSTER_INFO,
         "ModeSelect": _MODE_SELECT_CLUSTER_INFO,
         "LaundryWasherMode": _LAUNDRY_WASHER_MODE_CLUSTER_INFO,
         "RefrigeratorAndTemperatureControlledCabinetMode": _REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER_INFO,
@@ -12495,6 +13036,9 @@ class ChipClusters:
         "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,
         "DoorLock": _DOOR_LOCK_CLUSTER_INFO,
         "WindowCovering": _WINDOW_COVERING_CLUSTER_INFO,
         "BarrierControl": _BARRIER_CONTROL_CLUSTER_INFO,
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index 0eaff0e245e66e..2e6abe5faca104 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
@@ -661,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):
@@ -1063,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):
@@ -1079,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):
@@ -1095,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):
@@ -1111,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):
@@ -1164,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
@@ -1175,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):
@@ -1834,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
@@ -1843,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
@@ -1858,7 +1879,7 @@ class Feature(IntFlag):
             kLighting = 0x2
             kFrequency = 0x4
 
-        class LevelControlOptions(IntFlag):
+        class OptionsBitmap(IntFlag):
             kExecuteIfOff = 0x1
             kCoupleColorTempToLevel = 0x2
 
@@ -1896,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
@@ -1918,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
@@ -1982,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
@@ -2004,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
@@ -4108,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]),
@@ -4137,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
@@ -4564,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
@@ -7472,6 +7529,7 @@ class Feature(IntFlag):
             kWiFiNetworkInterface = 0x1
             kThreadNetworkInterface = 0x2
             kEthernetNetworkInterface = 0x4
+            kPerDeviceCredentials = 0x8
 
         class ThreadCapabilitiesBitmap(IntFlag):
             kIsBorderRouterCapable = 0x1
@@ -7486,6 +7544,7 @@ class WiFiSecurityBitmap(IntFlag):
             kWpaPersonal = 0x4
             kWpa2Personal = 0x8
             kWpa3Personal = 0x10
+            kWpa3MatterPdc = 0x20
 
     class Structs:
         @dataclass
@@ -7496,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):
@@ -7602,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):
@@ -7658,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):
@@ -7722,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):
@@ -15085,19 +15194,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]),
@@ -15106,12 +15212,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
@@ -15119,43 +15222,26 @@ 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
-
-    class Structs:
-        @dataclass
-        class SemanticTagStruct(ClusterObject):
-            @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                        ClusterObjectFieldDescriptor(Label="mfgCode", Tag=0, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=uint),
-                    ])
-
-            mfgCode: 'uint' = 0
-            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="semanticTags", Tag=2, Type=typing.List[ModeSelect.Structs.SemanticTagStruct]),
-                    ])
-
-            label: 'str' = ""
-            mode: 'uint' = 0
-            semanticTags: 'typing.List[ModeSelect.Structs.SemanticTagStruct]' = field(default_factory=lambda: [])
+            kReset = 0x1
 
     class Commands:
         @dataclass
-        class ChangeToMode(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000050
+        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
@@ -15164,322 +15250,62 @@ class ChangeToMode(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="newMode", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="newTime", Tag=0, Type=uint),
                     ])
 
-            newMode: 'uint' = 0
+            newTime: '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' = ""
-
-        @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
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[ModeSelect.Structs.ModeOptionStruct])
-
-            value: 'typing.List[ModeSelect.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
-
-        @dataclass
-        class CurrentMode(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000050
-
-            @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 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 0x00000050
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000005
-
-            @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 0x00000050
-
-            @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 0x00000050
-
-            @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 0x00000050
-
-            @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 0x00000050
-
-            @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 0x00000050
-
-            @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 0x00000050
-
-            @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 LaundryWasherMode(Cluster):
-    id: typing.ClassVar[int] = 0x00000051
-
-    @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="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[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
-    eventList: 'typing.List[uint]' = None
-    attributeList: 'typing.List[uint]' = None
-    featureMap: 'uint' = None
-    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 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
+        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
 
-        @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[LaundryWasherMode.Structs.ModeTagStruct]),
                     ])
 
-            label: 'str' = ""
-            mode: 'uint' = 0
-            modeTags: 'typing.List[LaundryWasherMode.Structs.ModeTagStruct]' = field(default_factory=lambda: [])
-
-    class Commands:
         @dataclass
-        class ChangeToMode(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000051
-            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] = 'ChangeToModeResponse'
+            response_type: typing.ClassVar[str] = None
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="newMode", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="additionalTime", Tag=0, Type=uint),
                     ])
 
-            newMode: 'uint' = 0
+            additionalTime: 'uint' = 0
 
         @dataclass
-        class ChangeToModeResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000051
-            command_id: typing.ClassVar[int] = 0x00000001
-            is_client: typing.ClassVar[bool] = False
+        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 descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=uint),
-                        ClusterObjectFieldDescriptor(Label="statusText", Tag=1, Type=typing.Optional[str]),
+                        ClusterObjectFieldDescriptor(Label="timeReduction", Tag=0, Type=uint),
                     ])
 
-            status: 'uint' = 0
-            statusText: 'typing.Optional[str]' = None
+            timeReduction: 'uint' = 0
 
     class Attributes:
         @dataclass
-        class SupportedModes(ClusterAttributeDescriptor):
+        class SetTime(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000051
+                return 0x00000047
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15487,15 +15313,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[LaundryWasherMode.Structs.ModeOptionStruct])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.List[LaundryWasherMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
+            value: 'uint' = 0
 
         @dataclass
-        class CurrentMode(ClusterAttributeDescriptor):
+        class TimeRemaining(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000051
+                return 0x00000047
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15508,10 +15334,10 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'uint' = 0
 
         @dataclass
-        class StartUpMode(ClusterAttributeDescriptor):
+        class TimerState(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000051
+                return 0x00000047
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15519,31 +15345,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 OnMode(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000051
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000003
-
-            @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 0x00000051
+                return 0x00000047
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15559,7 +15369,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000051
+                return 0x00000047
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15575,7 +15385,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000051
+                return 0x00000047
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15591,7 +15401,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000051
+                return 0x00000047
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15607,7 +15417,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000051
+                return 0x00000047
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15623,7 +15433,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000051
+                return 0x00000047
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15637,14 +15447,14 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @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]),
@@ -15656,7 +15466,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
@@ -15669,13 +15479,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):
@@ -15703,17 +15520,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'
@@ -15729,7 +15546,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
@@ -15750,7 +15567,7 @@ class Attributes:
         class SupportedModes(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000052
+                return 0x00000049
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15758,15 +15575,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:
@@ -15782,7 +15599,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:
@@ -15798,7 +15615,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:
@@ -15814,7 +15631,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:
@@ -15830,7 +15647,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:
@@ -15846,7 +15663,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:
@@ -15862,7 +15679,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:
@@ -15878,7 +15695,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:
@@ -15894,7 +15711,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:
@@ -15908,17 +15725,19 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class LaundryWasherControls(Cluster):
-    id: typing.ClassVar[int] = 0x00000053
+class ModeSelect(Cluster):
+    id: typing.ClassVar[int] = 0x00000050
 
     @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="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]),
@@ -15927,10 +15746,12 @@ 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
+    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
     eventList: 'typing.List[uint]' = None
@@ -15938,29 +15759,62 @@ 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 Feature(IntFlag):
-            kSpin = 0x1
-            kRinse = 0x2
+            kOnOff = 0x1
+
+    class Structs:
+        @dataclass
+        class SemanticTagStruct(ClusterObject):
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="mfgCode", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=uint),
+                    ])
+
+            mfgCode: 'uint' = 0
+            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="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
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = None
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="newMode", Tag=0, Type=uint),
+                    ])
+
+            newMode: 'uint' = 0
 
     class Attributes:
         @dataclass
-        class SpinSpeeds(ClusterAttributeDescriptor):
+        class Description(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000053
+                return 0x00000050
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15968,15 +15822,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[str]])
+                return ClusterObjectFieldDescriptor(Type=str)
 
-            value: 'typing.Optional[typing.List[str]]' = None
+            value: 'str' = ""
 
         @dataclass
-        class SpinSpeedCurrent(ClusterAttributeDescriptor):
+        class StandardNamespace(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000053
+                return 0x00000050
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -15984,15 +15838,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.Union[Nullable, uint])
 
-            value: 'typing.Union[None, Nullable, uint]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class NumberOfRinses(ClusterAttributeDescriptor):
+        class SupportedModes(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000053
+                return 0x00000050
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16000,15 +15854,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[LaundryWasherControls.Enums.NumberOfRinsesEnum])
+                return ClusterObjectFieldDescriptor(Type=typing.List[ModeSelect.Structs.ModeOptionStruct])
 
-            value: 'typing.Optional[LaundryWasherControls.Enums.NumberOfRinsesEnum]' = None
+            value: 'typing.List[ModeSelect.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
 
         @dataclass
-        class SupportedRinses(ClusterAttributeDescriptor):
+        class CurrentMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000053
+                return 0x00000050
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16016,15 +15870,47 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[LaundryWasherControls.Enums.NumberOfRinsesEnum]])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[typing.List[LaundryWasherControls.Enums.NumberOfRinsesEnum]]' = None
+            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 0x00000050
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000005
+
+            @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 0x00000053
+                return 0x00000050
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16040,7 +15926,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000053
+                return 0x00000050
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16056,7 +15942,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000053
+                return 0x00000050
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16072,7 +15958,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000053
+                return 0x00000050
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16088,7 +15974,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000053
+                return 0x00000050
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16104,7 +15990,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000053
+                return 0x00000050
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16118,15 +16004,16 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class RvcRunMode(Cluster):
-    id: typing.ClassVar[int] = 0x00000054
+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[RvcRunMode.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]),
@@ -16136,8 +16023,9 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    supportedModes: 'typing.List[RvcRunMode.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
@@ -16148,23 +16036,10 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
     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
+            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
@@ -16197,17 +16072,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[RvcRunMode.Structs.ModeTagStruct]),
+                        ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[LaundryWasherMode.Structs.ModeTagStruct]),
                     ])
 
             label: 'str' = ""
             mode: 'uint' = 0
-            modeTags: 'typing.List[RvcRunMode.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] = 0x00000054
+            cluster_id: typing.ClassVar[int] = 0x00000051
             command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'ChangeToModeResponse'
@@ -16223,7 +16098,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
         @dataclass
         class ChangeToModeResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000054
+            cluster_id: typing.ClassVar[int] = 0x00000051
             command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
@@ -16244,7 +16119,7 @@ class Attributes:
         class SupportedModes(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000054
+                return 0x00000051
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16252,15 +16127,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[RvcRunMode.Structs.ModeOptionStruct])
+                return ClusterObjectFieldDescriptor(Type=typing.List[LaundryWasherMode.Structs.ModeOptionStruct])
 
-            value: 'typing.List[RvcRunMode.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 0x00000054
+                return 0x00000051
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16272,11 +16147,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 0x00000054
+                return 0x00000051
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16292,7 +16183,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000054
+                return 0x00000051
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16308,7 +16199,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000054
+                return 0x00000051
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16324,7 +16215,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000054
+                return 0x00000051
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16340,7 +16231,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000054
+                return 0x00000051
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16356,7 +16247,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000054
+                return 0x00000051
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16372,7 +16263,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000054
+                return 0x00000051
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16386,15 +16277,16 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class RvcCleanMode(Cluster):
-    id: typing.ClassVar[int] = 0x00000055
+class RefrigeratorAndTemperatureControlledCabinetMode(Cluster):
+    id: typing.ClassVar[int] = 0x00000052
 
     @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[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]),
@@ -16404,8 +16296,9 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    supportedModes: 'typing.List[RvcCleanMode.Structs.ModeOptionStruct]' = 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
@@ -16416,17 +16309,8 @@ 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
+            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
@@ -16459,17 +16343,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[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeTagStruct]),
                     ])
 
             label: 'str' = ""
             mode: 'uint' = 0
-            modeTags: 'typing.List[RvcCleanMode.Structs.ModeTagStruct]' = field(default_factory=lambda: [])
+            modeTags: 'typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeTagStruct]' = field(default_factory=lambda: [])
 
     class Commands:
         @dataclass
         class ChangeToMode(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000055
+            cluster_id: typing.ClassVar[int] = 0x00000052
             command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'ChangeToModeResponse'
@@ -16485,7 +16369,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
         @dataclass
         class ChangeToModeResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000055
+            cluster_id: typing.ClassVar[int] = 0x00000052
             command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
@@ -16506,7 +16390,7 @@ class Attributes:
         class SupportedModes(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000055
+                return 0x00000052
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16514,15 +16398,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[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeOptionStruct])
 
-            value: 'typing.List[RvcCleanMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
+            value: 'typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
 
         @dataclass
         class CurrentMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000055
+                return 0x00000052
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16534,11 +16418,27 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'uint' = 0
 
+        @dataclass
+        class StartUpMode(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000052
+
+            @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 0x00000052
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16554,7 +16454,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000055
+                return 0x00000052
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16570,7 +16470,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000055
+                return 0x00000052
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16586,7 +16486,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000055
+                return 0x00000052
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16602,7 +16502,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000055
+                return 0x00000052
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16618,7 +16518,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000055
+                return 0x00000052
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16634,7 +16534,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000055
+                return 0x00000052
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16648,19 +16548,17 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class TemperatureControl(Cluster):
-    id: typing.ClassVar[int] = 0x00000056
+class LaundryWasherControls(Cluster):
+    id: typing.ClassVar[int] = 0x00000053
 
     @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="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]),
@@ -16669,12 +16567,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
+    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
@@ -16682,37 +16578,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 Feature(IntFlag):
-            kTemperatureNumber = 0x1
-            kTemperatureLevel = 0x2
-            kTemperatureStep = 0x4
-
-    class Commands:
-        @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
-
-            @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]),
-                    ])
-
-            targetTemperature: 'typing.Optional[int]' = None
-            targetTemperatureLevel: 'typing.Optional[uint]' = None
+            kSpin = 0x1
+            kRinse = 0x2
 
     class Attributes:
         @dataclass
-        class TemperatureSetpoint(ClusterAttributeDescriptor):
+        class SpinSpeeds(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000053
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16720,15 +16608,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[str]])
 
-            value: 'typing.Optional[int]' = None
+            value: 'typing.Optional[typing.List[str]]' = None
 
         @dataclass
-        class MinTemperature(ClusterAttributeDescriptor):
+        class SpinSpeedCurrent(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000053
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16736,15 +16624,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
 
-            value: 'typing.Optional[int]' = None
+            value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
-        class MaxTemperature(ClusterAttributeDescriptor):
+        class NumberOfRinses(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000053
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16752,15 +16640,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[LaundryWasherControls.Enums.NumberOfRinsesEnum])
 
-            value: 'typing.Optional[int]' = None
+            value: 'typing.Optional[LaundryWasherControls.Enums.NumberOfRinsesEnum]' = None
 
         @dataclass
-        class Step(ClusterAttributeDescriptor):
+        class SupportedRinses(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000053
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16768,47 +16656,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
-
-            value: 'typing.Optional[int]' = None
-
-        @dataclass
-        class SelectedTemperatureLevel(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000056
-
-            @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 SupportedTemperatureLevels(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000056
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000005
-
-            @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[str]])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[LaundryWasherControls.Enums.NumberOfRinsesEnum]])
 
-            value: 'typing.Optional[typing.List[str]]' = None
+            value: 'typing.Optional[typing.List[LaundryWasherControls.Enums.NumberOfRinsesEnum]]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000053
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16824,7 +16680,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000053
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16840,7 +16696,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000053
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16856,7 +16712,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000053
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16872,7 +16728,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000053
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16888,7 +16744,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000056
+                return 0x00000053
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16902,16 +16758,16 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class RefrigeratorAlarm(Cluster):
-    id: typing.ClassVar[int] = 0x00000057
+class RvcRunMode(Cluster):
+    id: typing.ClassVar[int] = 0x00000054
 
     @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="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="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]),
@@ -16920,9 +16776,9 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    mask: 'uint' = None
-    state: 'uint' = None
-    supported: 'uint' = None
+    supportedModes: 'typing.List[RvcRunMode.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
@@ -16930,16 +16786,105 @@ 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 AlarmMap(IntFlag):
-            kDoorOpen = 0x1
+        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[RvcRunMode.Structs.ModeTagStruct]),
+                    ])
+
+            label: 'str' = ""
+            mode: 'uint' = 0
+            modeTags: 'typing.List[RvcRunMode.Structs.ModeTagStruct]' = field(default_factory=lambda: [])
+
+    class Commands:
+        @dataclass
+        class ChangeToMode(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000054
+            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] = 0x00000054
+            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 Mask(ClusterAttributeDescriptor):
+        class SupportedModes(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000057
+                return 0x00000054
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16947,19 +16892,19 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.List[RvcRunMode.Structs.ModeOptionStruct])
 
-            value: 'uint' = 0
+            value: 'typing.List[RvcRunMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
 
         @dataclass
-        class State(ClusterAttributeDescriptor):
+        class CurrentMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000057
+                return 0x00000054
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000002
+                return 0x00000001
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
@@ -16968,10 +16913,10 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'uint' = 0
 
         @dataclass
-        class Supported(ClusterAttributeDescriptor):
+        class OnMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000057
+                return 0x00000054
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -16979,15 +16924,15 @@ def attribute_id(cls) -> int:
 
             @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 GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000057
+                return 0x00000054
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17003,7 +16948,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000057
+                return 0x00000054
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17019,7 +16964,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000057
+                return 0x00000054
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17035,7 +16980,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000057
+                return 0x00000054
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17051,7 +16996,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000057
+                return 0x00000054
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17067,7 +17012,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000057
+                return 0x00000054
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17079,44 +17024,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 RvcCleanMode(Cluster):
+    id: typing.ClassVar[int] = 0x00000055
 
     @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[RvcCleanMode.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]),
@@ -17126,9 +17044,8 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    supportedModes: 'typing.List[DishwasherMode.Structs.ModeOptionStruct]' = None
+    supportedModes: 'typing.List[RvcCleanMode.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
@@ -17139,9 +17056,17 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
     class Enums:
         class ModeTag(MatterIntEnum):
-            kNormal = 0x4000
-            kHeavy = 0x4001
-            kLight = 0x4002
+            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
@@ -17174,17 +17099,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[RvcCleanMode.Structs.ModeTagStruct]),
                     ])
 
             label: 'str' = ""
             mode: 'uint' = 0
-            modeTags: 'typing.List[DishwasherMode.Structs.ModeTagStruct]' = field(default_factory=lambda: [])
+            modeTags: 'typing.List[RvcCleanMode.Structs.ModeTagStruct]' = field(default_factory=lambda: [])
 
     class Commands:
         @dataclass
         class ChangeToMode(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000059
+            cluster_id: typing.ClassVar[int] = 0x00000055
             command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'ChangeToModeResponse'
@@ -17200,7 +17125,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
         @dataclass
         class ChangeToModeResponse(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000059
+            cluster_id: typing.ClassVar[int] = 0x00000055
             command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
@@ -17221,7 +17146,7 @@ class Attributes:
         class SupportedModes(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000059
+                return 0x00000055
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17229,15 +17154,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[RvcCleanMode.Structs.ModeOptionStruct])
 
-            value: 'typing.List[DishwasherMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
+            value: 'typing.List[RvcCleanMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
 
         @dataclass
         class CurrentMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000059
+                return 0x00000055
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17249,27 +17174,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 0x00000055
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17285,7 +17194,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000059
+                return 0x00000055
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17301,7 +17210,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000059
+                return 0x00000055
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17317,7 +17226,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000059
+                return 0x00000055
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17333,7 +17242,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000059
+                return 0x00000055
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17349,7 +17258,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000059
+                return 0x00000055
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17365,7 +17274,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000059
+                return 0x00000055
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17379,14 +17288,19 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class AirQuality(Cluster):
-    id: typing.ClassVar[int] = 0x0000005B
+class TemperatureControl(Cluster):
+    id: typing.ClassVar[int] = 0x00000056
 
     @ChipUtility.classproperty
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields=[
-                ClusterObjectFieldDescriptor(Label="airQuality", Tag=0x00000000, Type=AirQuality.Enums.AirQualityEnum),
+                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]),
@@ -17395,7 +17309,12 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    airQuality: 'AirQuality.Enums.AirQualityEnum' = 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
@@ -17403,34 +17322,37 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     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
+            kTemperatureNumber = 0x1
+            kTemperatureLevel = 0x2
+            kTemperatureStep = 0x4
+
+    class Commands:
+        @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
+
+            @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]),
+                    ])
+
+            targetTemperature: 'typing.Optional[int]' = None
+            targetTemperatureLevel: 'typing.Optional[uint]' = None
 
     class Attributes:
         @dataclass
-        class AirQuality(ClusterAttributeDescriptor):
+        class TemperatureSetpoint(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005B
+                return 0x00000056
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17438,47 +17360,127 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=AirQuality.Enums.AirQualityEnum)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
 
-            value: 'AirQuality.Enums.AirQualityEnum' = 0
+            value: 'typing.Optional[int]' = None
 
         @dataclass
-        class GeneratedCommandList(ClusterAttributeDescriptor):
+        class MinTemperature(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005B
+                return 0x00000056
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFF8
+                return 0x00000001
 
             @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 AcceptedCommandList(ClusterAttributeDescriptor):
+        class MaxTemperature(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005B
+                return 0x00000056
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFF9
+                return 0x00000002
 
             @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 EventList(ClusterAttributeDescriptor):
+        class Step(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005B
+                return 0x00000056
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000003
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[int])
+
+            value: 'typing.Optional[int]' = None
+
+        @dataclass
+        class SelectedTemperatureLevel(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000056
+
+            @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 SupportedTemperatureLevels(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000056
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000005
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[str]])
+
+            value: 'typing.Optional[typing.List[str]]' = None
+
+        @dataclass
+        class GeneratedCommandList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000056
+
+            @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 0x00000056
+
+            @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 0x00000056
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17494,7 +17496,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005B
+                return 0x00000056
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17510,7 +17512,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005B
+                return 0x00000056
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17526,7 +17528,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005B
+                return 0x00000056
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17540,26 +17542,16 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class SmokeCoAlarm(Cluster):
-    id: typing.ClassVar[int] = 0x0000005C
+class RefrigeratorAlarm(Cluster):
+    id: typing.ClassVar[int] = 0x00000057
 
     @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="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]),
@@ -17568,19 +17560,9 @@ 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
+    mask: 'uint' = None
+    state: 'uint' = None
+    supported: 'uint' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -17588,97 +17570,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
-
-    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 AlarmMap(IntFlag):
+            kDoorOpen = 0x1
 
     class Attributes:
         @dataclass
-        class ExpressedState(ClusterAttributeDescriptor):
+        class Mask(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000057
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17686,207 +17587,345 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=SmokeCoAlarm.Enums.ExpressedStateEnum)
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'SmokeCoAlarm.Enums.ExpressedStateEnum' = 0
+            value: 'uint' = 0
 
         @dataclass
-        class SmokeState(ClusterAttributeDescriptor):
+        class State(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000057
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000001
+                return 0x00000002
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class COState(ClusterAttributeDescriptor):
+        class Supported(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000057
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000002
+                return 0x00000003
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class BatteryAlert(ClusterAttributeDescriptor):
+        class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000057
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000003
+                return 0x0000FFF8
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=SmokeCoAlarm.Enums.AlarmStateEnum)
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
-            value: 'SmokeCoAlarm.Enums.AlarmStateEnum' = 0
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class DeviceMuted(ClusterAttributeDescriptor):
+        class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000057
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000004
+                return 0x0000FFF9
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.MuteStateEnum])
+                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
 
-            value: 'typing.Optional[SmokeCoAlarm.Enums.MuteStateEnum]' = None
+            value: 'typing.List[uint]' = field(default_factory=lambda: [])
 
         @dataclass
-        class TestInProgress(ClusterAttributeDescriptor):
+        class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000057
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000005
+                return 0x0000FFFA
 
             @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 HardwareFaultAlert(ClusterAttributeDescriptor):
+        class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000057
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000006
+                return 0x0000FFFB
 
             @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 FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000057
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000007
+                return 0x0000FFFC
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=SmokeCoAlarm.Enums.EndOfServiceEnum)
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'SmokeCoAlarm.Enums.EndOfServiceEnum' = 0
+            value: 'uint' = 0
 
         @dataclass
-        class InterconnectSmokeAlarm(ClusterAttributeDescriptor):
+        class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000057
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000008
+                return 0x0000FFFD
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
+            value: 'uint' = 0
 
+    class Events:
         @dataclass
-        class InterconnectCOAlarm(ClusterAttributeDescriptor):
+        class Notify(ClusterEvent):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                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 0x00000009
+                return 0x00000000
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum])
+                return ClusterObjectFieldDescriptor(Type=typing.List[DishwasherMode.Structs.ModeOptionStruct])
 
-            value: 'typing.Optional[SmokeCoAlarm.Enums.AlarmStateEnum]' = None
+            value: 'typing.List[DishwasherMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
 
         @dataclass
-        class ContaminationState(ClusterAttributeDescriptor):
+        class CurrentMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000059
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000000A
+                return 0x00000001
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[SmokeCoAlarm.Enums.ContaminationStateEnum])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[SmokeCoAlarm.Enums.ContaminationStateEnum]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class SmokeSensitivityLevel(ClusterAttributeDescriptor):
+        class StartUpMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000059
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000000B
+                return 0x00000002
 
             @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 OnMode(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000059
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000000C
+                return 0x00000003
 
             @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 GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000059
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17902,7 +17941,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000059
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17918,7 +17957,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000059
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17934,7 +17973,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000059
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17950,7 +17989,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000059
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17966,7 +18005,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000059
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -17978,89 +18017,1619 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             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
+@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
+
+            @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 event_id(cls) -> int:
-                return 0x00000001
+            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="alarmSeverityLevel", Tag=0, Type=SmokeCoAlarm.Enums.AlarmStateEnum),
+                        ClusterObjectFieldDescriptor(Label="timeToAdd", Tag=0, Type=uint),
                     ])
 
-            alarmSeverityLevel: 'SmokeCoAlarm.Enums.AlarmStateEnum' = 0
+            timeToAdd: 'uint' = 0
 
+    class Attributes:
         @dataclass
-        class LowBattery(ClusterEvent):
+        class CookTime(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x0000005F
 
             @ChipUtility.classproperty
-            def event_id(cls) -> int:
+            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 descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                        ClusterObjectFieldDescriptor(Label="alarmSeverityLevel", Tag=0, Type=SmokeCoAlarm.Enums.AlarmStateEnum),
-                    ])
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            alarmSeverityLevel: 'SmokeCoAlarm.Enums.AlarmStateEnum' = 0
+            value: 'uint' = 0
 
         @dataclass
-        class HardwareFault(ClusterEvent):
+        class MinPower(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x0000005F
 
             @ChipUtility.classproperty
-            def event_id(cls) -> int:
+            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 EndOfService(ClusterEvent):
+        class OperationalStateStruct(ClusterObject):
             @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x0000005C
+            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 event_id(cls) -> int:
-                return 0x00000004
+            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:
@@ -18069,120 +19638,298 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                     ])
 
         @dataclass
-        class SelfTestComplete(ClusterEvent):
+        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 cluster_id(cls) -> int:
-                return 0x0000005C
+            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 event_id(cls) -> int:
-                return 0x00000005
+            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 AlarmMuted(ClusterEvent):
+        class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000060
 
             @ChipUtility.classproperty
-            def event_id(cls) -> int:
-                return 0x00000006
+            def attribute_id(cls) -> int:
+                return 0x0000FFFB
 
             @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 FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000060
 
             @ChipUtility.classproperty
-            def event_id(cls) -> int:
-                return 0x00000007
+            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 InterconnectSmokeAlarm(ClusterEvent):
+        class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000060
 
             @ChipUtility.classproperty
-            def event_id(cls) -> int:
-                return 0x00000008
+            def attribute_id(cls) -> int:
+                return 0x0000FFFD
 
             @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=uint)
 
-            alarmSeverityLevel: 'SmokeCoAlarm.Enums.AlarmStateEnum' = 0
+            value: 'uint' = 0
 
+    class Events:
         @dataclass
-        class InterconnectCOAlarm(ClusterEvent):
+        class OperationalError(ClusterEvent):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000060
 
             @ChipUtility.classproperty
             def event_id(cls) -> int:
-                return 0x00000009
+                return 0x00000000
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="alarmSeverityLevel", Tag=0, Type=SmokeCoAlarm.Enums.AlarmStateEnum),
+                        ClusterObjectFieldDescriptor(Label="errorState", Tag=0, Type=OperationalState.Structs.ErrorStateStruct),
                     ])
 
-            alarmSeverityLevel: 'SmokeCoAlarm.Enums.AlarmStateEnum' = 0
+            errorState: 'OperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: OperationalState.Structs.ErrorStateStruct())
 
         @dataclass
-        class AllClear(ClusterEvent):
+        class OperationCompletion(ClusterEvent):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005C
+                return 0x00000060
 
             @ChipUtility.classproperty
             def event_id(cls) -> int:
-                return 0x0000000A
+                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 DishwasherAlarm(Cluster):
-    id: typing.ClassVar[int] = 0x0000005D
+class RvcOperationalState(Cluster):
+    id: typing.ClassVar[int] = 0x00000061
 
     @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="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]),
@@ -18191,10 +19938,12 @@ 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
+    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
@@ -18202,57 +19951,136 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     featureMap: 'uint' = None
     clusterRevision: 'uint' = None
 
-    class Bitmaps:
-        class AlarmMap(IntFlag):
-            kInflowError = 0x1
-            kDrainError = 0x2
-            kDoorError = 0x4
-            kTempTooLow = 0x8
-            kTempTooHigh = 0x10
-            kWaterLevelError = 0x20
+    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 Feature(IntFlag):
-            kReset = 0x1
+        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 Reset(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0000005D
+        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] = None
+            response_type: typing.ClassVar[str] = 'OperationalCommandResponse'
 
             @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
+        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="mask", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="commandResponseState", Tag=0, Type=RvcOperationalState.Structs.ErrorStateStruct),
                     ])
 
-            mask: 'uint' = 0
+            commandResponseState: 'RvcOperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: RvcOperationalState.Structs.ErrorStateStruct())
 
     class Attributes:
         @dataclass
-        class Mask(ClusterAttributeDescriptor):
+        class PhaseList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000061
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18260,15 +20088,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, typing.List[str]])
 
-            value: 'uint' = 0
+            value: 'typing.Union[Nullable, typing.List[str]]' = NullValue
 
         @dataclass
-        class Latch(ClusterAttributeDescriptor):
+        class CurrentPhase(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000061
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18276,15 +20104,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, uint])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @dataclass
-        class State(ClusterAttributeDescriptor):
+        class CountdownTime(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000061
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18292,31 +20120,63 @@ def attribute_id(cls) -> int:
 
             @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 OperationalStateList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                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 0x0000005D
+                return 0x00000061
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18332,7 +20192,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000061
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18348,7 +20208,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000061
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18364,7 +20224,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000061
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18380,7 +20240,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000061
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18396,7 +20256,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000061
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18410,10 +20270,10 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
     class Events:
         @dataclass
-        class Notify(ClusterEvent):
+        class OperationalError(ClusterEvent):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005D
+                return 0x00000061
 
             @ChipUtility.classproperty
             def event_id(cls) -> int:
@@ -18423,28 +20283,49 @@ 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="errorState", Tag=0, Type=RvcOperationalState.Structs.ErrorStateStruct),
                     ])
 
-            active: 'uint' = 0
-            inactive: 'uint' = 0
-            state: 'uint' = 0
-            mask: 'uint' = 0
+            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 MicrowaveOvenMode(Cluster):
-    id: typing.ClassVar[int] = 0x0000005E
+class HepaFilterMonitoring(Cluster):
+    id: typing.ClassVar[int] = 0x00000071
 
     @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="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]),
@@ -18453,8 +20334,12 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    supportedModes: 'typing.List[MicrowaveOvenMode.Structs.ModeOptionStruct]' = None
-    currentMode: 'uint' = None
+    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
@@ -18463,54 +20348,77 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class ModeTag(MatterIntEnum):
-            kNormal = 0x4000
-            kDefrost = 0x4001
+        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 = 0,
+            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):
-            kOnOff = 0x1
+            kCondition = 0x1
+            kWarning = 0x2
+            kReplacementProductList = 0x4
 
     class Structs:
         @dataclass
-        class ModeTagStruct(ClusterObject):
+        class ReplacementProductStruct(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="productIdentifierType", Tag=0, Type=HepaFilterMonitoring.Enums.ProductIdentifierTypeEnum),
+                        ClusterObjectFieldDescriptor(Label="productIdentifierValue", Tag=1, Type=str),
                     ])
 
-            mfgCode: 'typing.Optional[uint]' = None
-            value: 'uint' = 0
+            productIdentifierType: 'HepaFilterMonitoring.Enums.ProductIdentifierTypeEnum' = 0
+            productIdentifierValue: 'str' = ""
 
+    class Commands:
         @dataclass
-        class ModeOptionStruct(ClusterObject):
+        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=[
-                        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):
+        class Condition(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005E
+                return 0x00000071
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18518,15 +20426,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[MicrowaveOvenMode.Structs.ModeOptionStruct])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.List[MicrowaveOvenMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: [])
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class CurrentMode(ClusterAttributeDescriptor):
+        class DegradationDirection(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005E
+                return 0x00000071
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18534,15 +20442,79 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[HepaFilterMonitoring.Enums.DegradationDirectionEnum])
 
-            value: 'uint' = 0
+            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 0x00000003
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[bool])
+
+            value: 'typing.Optional[bool]' = None
+
+        @dataclass
+        class LastChangedTime(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000071
+
+            @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 ReplacementProductList(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000071
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000005
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[HepaFilterMonitoring.Structs.ReplacementProductStruct]])
+
+            value: 'typing.Optional[typing.List[HepaFilterMonitoring.Structs.ReplacementProductStruct]]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005E
+                return 0x00000071
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18558,7 +20530,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005E
+                return 0x00000071
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18574,7 +20546,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005E
+                return 0x00000071
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18590,7 +20562,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005E
+                return 0x00000071
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18606,7 +20578,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005E
+                return 0x00000071
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18622,7 +20594,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005E
+                return 0x00000071
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18636,18 +20608,19 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class MicrowaveOvenControl(Cluster):
-    id: typing.ClassVar[int] = 0x0000005F
+class ActivatedCarbonFilterMonitoring(Cluster):
+    id: typing.ClassVar[int] = 0x00000072
 
     @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="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]),
@@ -18656,11 +20629,12 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 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
+    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
@@ -18668,31 +20642,63 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     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
+    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="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]),
+                        ClusterObjectFieldDescriptor(Label="productIdentifierType", Tag=0, Type=ActivatedCarbonFilterMonitoring.Enums.ProductIdentifierTypeEnum),
+                        ClusterObjectFieldDescriptor(Label="productIdentifierValue", Tag=1, Type=str),
                     ])
 
-            cookMode: 'typing.Optional[uint]' = None
-            cookTime: 'typing.Optional[uint]' = None
-            powerSetting: 'typing.Optional[uint]' = None
+            productIdentifierType: 'ActivatedCarbonFilterMonitoring.Enums.ProductIdentifierTypeEnum' = 0
+            productIdentifierValue: 'str' = ""
 
+    class Commands:
         @dataclass
-        class AddMoreTime(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x0000005F
-            command_id: typing.ClassVar[int] = 0x00000001
+        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
 
@@ -18700,17 +20706,30 @@ class AddMoreTime(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="timeToAdd", Tag=0, Type=uint),
                     ])
 
-            timeToAdd: 'uint' = 0
-
     class Attributes:
         @dataclass
-        class CookTime(ClusterAttributeDescriptor):
+        class Condition(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005F
+                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 DegradationDirection(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000072
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18718,15 +20737,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[ActivatedCarbonFilterMonitoring.Enums.DegradationDirectionEnum])
 
-            value: 'uint' = 0
+            value: 'typing.Optional[ActivatedCarbonFilterMonitoring.Enums.DegradationDirectionEnum]' = None
 
         @dataclass
-        class PowerSetting(ClusterAttributeDescriptor):
+        class ChangeIndication(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005F
+                return 0x00000072
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18734,15 +20753,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=ActivatedCarbonFilterMonitoring.Enums.ChangeIndicationEnum)
 
-            value: 'uint' = 0
+            value: 'ActivatedCarbonFilterMonitoring.Enums.ChangeIndicationEnum' = 0
 
         @dataclass
-        class MinPower(ClusterAttributeDescriptor):
+        class InPlaceIndicator(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005F
+                return 0x00000072
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18750,15 +20769,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[bool])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Optional[bool]' = None
 
         @dataclass
-        class MaxPower(ClusterAttributeDescriptor):
+        class LastChangedTime(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005F
+                return 0x00000072
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18766,15 +20785,15 @@ def attribute_id(cls) -> int:
 
             @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 PowerStep(ClusterAttributeDescriptor):
+        class ReplacementProductList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005F
+                return 0x00000072
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18782,15 +20801,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[ActivatedCarbonFilterMonitoring.Structs.ReplacementProductStruct]])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.Optional[typing.List[ActivatedCarbonFilterMonitoring.Structs.ReplacementProductStruct]]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005F
+                return 0x00000072
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18806,7 +20825,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005F
+                return 0x00000072
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18822,7 +20841,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005F
+                return 0x00000072
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18838,7 +20857,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005F
+                return 0x00000072
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18854,7 +20873,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005F
+                return 0x00000072
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18870,7 +20889,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x0000005F
+                return 0x00000072
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -18884,19 +20903,17 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
 
 @dataclass
-class OperationalState(Cluster):
-    id: typing.ClassVar[int] = 0x00000060
+class BooleanSensorConfiguration(Cluster):
+    id: typing.ClassVar[int] = 0x00000080
 
     @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="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]),
@@ -18905,12 +20922,10 @@ 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
+    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
@@ -18919,132 +20934,50 @@ 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 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 = 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
+            kUnknownEnumValue = 3,
 
-        @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]),
-                    ])
+    class Bitmaps:
+        class AlarmModeBitmap(IntFlag):
+            kVisual = 0x1
+            kAudible = 0x2
 
-            operationalStateID: 'uint' = 0
-            operationalStateLabel: 'typing.Optional[str]' = None
+        class Feature(IntFlag):
+            kVisual = 0x1
+            kAudible = 0x2
+            kAlarmSuppress = 0x4
+            kSensitivityLevel = 0x8
 
     class Commands:
         @dataclass
-        class Pause(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000060
+        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] = '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),
+                        ClusterObjectFieldDescriptor(Label="alarmsToSuppress", Tag=0, Type=uint),
                     ])
 
-            commandResponseState: 'OperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: OperationalState.Structs.ErrorStateStruct())
+            alarmsToSuppress: 'uint' = 0
 
     class Attributes:
         @dataclass
-        class PhaseList(ClusterAttributeDescriptor):
+        class SensitivityLevel(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19052,15 +20985,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.Optional[BooleanSensorConfiguration.Enums.SensitivityEnum])
 
-            value: 'typing.Union[Nullable, typing.List[str]]' = NullValue
+            value: 'typing.Optional[BooleanSensorConfiguration.Enums.SensitivityEnum]' = None
 
         @dataclass
-        class CurrentPhase(ClusterAttributeDescriptor):
+        class AlarmsActive(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19068,15 +21001,15 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class CountdownTime(ClusterAttributeDescriptor):
+        class AlarmsSuppressed(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19084,15 +21017,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.Optional[uint])
 
-            value: 'typing.Union[None, Nullable, uint]' = None
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
-        class OperationalStateList(ClusterAttributeDescriptor):
+        class AlarmsEnabled(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19100,47 +21033,15 @@ def attribute_id(cls) -> int:
 
             @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)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'OperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: OperationalState.Structs.ErrorStateStruct())
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19156,7 +21057,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19172,7 +21073,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19188,7 +21089,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19204,7 +21105,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19220,7 +21121,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000080
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19234,10 +21135,10 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
     class Events:
         @dataclass
-        class OperationalError(ClusterEvent):
+        class AlarmsStateChanged(ClusterEvent):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000080
 
             @ChipUtility.classproperty
             def event_id(cls) -> int:
@@ -19247,16 +21148,18 @@ def event_id(cls) -> int:
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="errorState", Tag=0, Type=OperationalState.Structs.ErrorStateStruct),
+                        ClusterObjectFieldDescriptor(Label="alarmsActive", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="alarmsSuppressed", Tag=1, Type=typing.Optional[uint]),
                     ])
 
-            errorState: 'OperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: OperationalState.Structs.ErrorStateStruct())
+            alarmsActive: 'uint' = 0
+            alarmsSuppressed: 'typing.Optional[uint]' = None
 
         @dataclass
-        class OperationCompletion(ClusterEvent):
+        class SensorFault(ClusterEvent):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000060
+                return 0x00000080
 
             @ChipUtility.classproperty
             def event_id(cls) -> int:
@@ -19266,30 +21169,27 @@ 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]),
                     ])
 
-            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
+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[RvcOperationalState.Structs.OperationalStateStruct]),
-                ClusterObjectFieldDescriptor(Label="operationalState", Tag=0x00000004, Type=uint),
-                ClusterObjectFieldDescriptor(Label="operationalError", Tag=0x00000005, Type=RvcOperationalState.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]),
@@ -19298,12 +21198,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[RvcOperationalState.Structs.OperationalStateStruct]' = None
-    operationalState: 'uint' = None
-    operationalError: 'RvcOperationalState.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
@@ -19312,80 +21216,48 @@ 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 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
+        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 = 2,
 
-        @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]),
-                    ])
+    class Bitmaps:
+        class Feature(IntFlag):
+            kTimeSync = 0x1
+            kLevel = 0x2
 
-            operationalStateID: 'uint' = 0
-            operationalStateLabel: 'typing.Optional[str]' = None
+        class ValveFaultBitmap(IntFlag):
+            kGeneralFault = 0x1
+            kBlocked = 0x2
+            kLeaking = 0x4
 
     class Commands:
         @dataclass
-        class Pause(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000061
+        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 Stop(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000061
+        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:
@@ -19394,89 +21266,129 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                     ])
 
         @dataclass
-        class Start(ClusterCommand):
-            cluster_id: typing.ClassVar[int] = 0x00000061
+        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] = 'OperationalCommandResponse'
+            response_type: typing.ClassVar[str] = None
 
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
+                        ClusterObjectFieldDescriptor(Label="level", Tag=0, Type=uint),
+                        ClusterObjectFieldDescriptor(Label="openDuration", Tag=1, Type=typing.Optional[uint]),
                     ])
 
+            level: 'uint' = 0
+            openDuration: 'typing.Optional[uint]' = None
+
+    class Attributes:
         @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'
+        class OpenDuration(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000081
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+
+            value: 'typing.Union[Nullable, uint]' = NullValue
 
         @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
+        class AutoCloseTime(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000081
 
             @ChipUtility.classproperty
-            def descriptor(cls) -> ClusterObjectDescriptor:
-                return ClusterObjectDescriptor(
-                    Fields=[
-                        ClusterObjectFieldDescriptor(Label="commandResponseState", Tag=0, Type=RvcOperationalState.Structs.ErrorStateStruct),
-                    ])
+            def attribute_id(cls) -> int:
+                return 0x00000001
 
-            commandResponseState: 'RvcOperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: RvcOperationalState.Structs.ErrorStateStruct())
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+
+            value: 'typing.Union[None, Nullable, uint]' = None
 
-    class Attributes:
         @dataclass
-        class PhaseList(ClusterAttributeDescriptor):
+        class RemainingDuration(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000000
+                return 0x00000002
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, typing.List[str]])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
 
-            value: 'typing.Union[Nullable, typing.List[str]]' = NullValue
+            value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
-        class CurrentPhase(ClusterAttributeDescriptor):
+        class CurrentState(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000001
+                return 0x00000003
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, ValveConfigurationAndControl.Enums.ValveStateEnum])
 
-            value: 'typing.Union[Nullable, uint]' = NullValue
+            value: 'typing.Union[Nullable, ValveConfigurationAndControl.Enums.ValveStateEnum]' = NullValue
 
         @dataclass
-        class CountdownTime(ClusterAttributeDescriptor):
+        class TargetState(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000002
+                return 0x00000004
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, ValveConfigurationAndControl.Enums.ValveStateEnum])
+
+            value: 'typing.Union[Nullable, ValveConfigurationAndControl.Enums.ValveStateEnum]' = NullValue
+
+        @dataclass
+        class StartUpState(ClusterAttributeDescriptor):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000081
+
+            @ChipUtility.classproperty
+            def attribute_id(cls) -> int:
+                return 0x00000005
+
+            @ChipUtility.classproperty
+            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[ValveConfigurationAndControl.Enums.ValveStateEnum])
+
+            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:
@@ -19485,58 +21397,58 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
             value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
-        class OperationalStateList(ClusterAttributeDescriptor):
+        class TargetLevel(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000003
+                return 0x00000007
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[RvcOperationalState.Structs.OperationalStateStruct])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
 
-            value: 'typing.List[RvcOperationalState.Structs.OperationalStateStruct]' = field(default_factory=lambda: [])
+            value: 'typing.Union[None, Nullable, uint]' = None
 
         @dataclass
-        class OperationalState(ClusterAttributeDescriptor):
+        class OpenLevel(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000004
+                return 0x00000008
 
             @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 OperationalError(ClusterAttributeDescriptor):
+        class ValveFault(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000005
+                return 0x00000009
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=RvcOperationalState.Structs.ErrorStateStruct)
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
 
-            value: 'RvcOperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: RvcOperationalState.Structs.ErrorStateStruct())
+            value: 'typing.Optional[uint]' = None
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19552,7 +21464,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19568,7 +21480,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19584,7 +21496,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19600,7 +21512,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19616,7 +21528,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000081
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -19630,10 +21542,10 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
     class Events:
         @dataclass
-        class OperationalError(ClusterEvent):
+        class ValveStateChanged(ClusterEvent):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000081
 
             @ChipUtility.classproperty
             def event_id(cls) -> int:
@@ -19643,16 +21555,16 @@ def event_id(cls) -> int:
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
-                        ClusterObjectFieldDescriptor(Label="errorState", Tag=0, Type=RvcOperationalState.Structs.ErrorStateStruct),
+                        ClusterObjectFieldDescriptor(Label="valveState", Tag=0, Type=ValveConfigurationAndControl.Enums.ValveStateEnum),
                     ])
 
-            errorState: 'RvcOperationalState.Structs.ErrorStateStruct' = field(default_factory=lambda: RvcOperationalState.Structs.ErrorStateStruct())
+            valveState: 'ValveConfigurationAndControl.Enums.ValveStateEnum' = 0
 
         @dataclass
-        class OperationCompletion(ClusterEvent):
+        class ValveFault(ClusterEvent):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000061
+                return 0x00000081
 
             @ChipUtility.classproperty
             def event_id(cls) -> int:
@@ -19662,30 +21574,29 @@ 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 HepaFilterMonitoring(Cluster):
-    id: typing.ClassVar[int] = 0x00000071
+class DemandResponseLoadControl(Cluster):
+    id: typing.ClassVar[int] = 0x00000096
 
     @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="deviceClass", Tag=0x00000000, Type=uint),
+                ClusterObjectFieldDescriptor(Label="loadControlPrograms", Tag=0x00000001, Type=typing.List[DemandResponseLoadControl.Structs.LoadControlProgramStruct]),
+                ClusterObjectFieldDescriptor(Label="numberOfLoadControlPrograms", Tag=0x00000002, Type=uint),
+                ClusterObjectFieldDescriptor(Label="events", Tag=0x00000003, Type=typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct]),
+                ClusterObjectFieldDescriptor(Label="activeEvents", Tag=0x00000004, Type=typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct]),
+                ClusterObjectFieldDescriptor(Label="numberOfEventsPerProgram", Tag=0x00000005, Type=uint),
+                ClusterObjectFieldDescriptor(Label="numberOfTransistions", Tag=0x00000006, Type=uint),
+                ClusterObjectFieldDescriptor(Label="defaultRandomStart", Tag=0x00000007, Type=uint),
+                ClusterObjectFieldDescriptor(Label="defaultRandomDuration", Tag=0x00000008, 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]),
@@ -19694,12 +21605,15 @@ 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
+    deviceClass: 'uint' = 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
+    numberOfTransistions: 'uint' = None
+    defaultRandomStart: 'uint' = None
+    defaultRandomDuration: 'uint' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
     eventList: 'typing.List[uint]' = None
@@ -19708,257 +21622,362 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class ChangeIndicationEnum(MatterIntEnum):
-            kOk = 0x00
-            kWarning = 0x01
-            kCritical = 0x02
+        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 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 DegradationDirectionEnum(MatterIntEnum):
-            kUp = 0x00
-            kDown = 0x01
+        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 ProductIdentifierTypeEnum(MatterIntEnum):
-            kUpc = 0x00
-            kGtin8 = 0x01
-            kEan = 0x02
-            kGtin14 = 0x03
-            kOem = 0x04
+        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 = 5,
+            kUnknownEnumValue = 13,
+
+        class PowerSavingsEnum(MatterIntEnum):
+            kLow = 0x00
+            kMedium = 0x01
+            kHigh = 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 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):
-            kCondition = 0x1
-            kWarning = 0x2
-            kReplacementProductList = 0x4
+            kEnrollmentGroups = 0x1
+            kTemperatureOffset = 0x2
+            kTemperatureSetpoint = 0x4
+            kLoadAdjustment = 0x8
+            kDutyCycle = 0x10
+            kPowerSavings = 0x20
+            kHeatingSource = 0x40
 
     class Structs:
         @dataclass
-        class ReplacementProductStruct(ClusterObject):
+        class HeatingSourceControlStruct(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),
+                        ClusterObjectFieldDescriptor(Label="heatingSource", Tag=0, Type=DemandResponseLoadControl.Enums.HeatingSourceEnum),
                     ])
 
-            productIdentifierType: 'HepaFilterMonitoring.Enums.ProductIdentifierTypeEnum' = 0
-            productIdentifierValue: 'str' = ""
+            heatingSource: 'DemandResponseLoadControl.Enums.HeatingSourceEnum' = 0
 
-    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
-
+        class PowerSavingsControlStruct(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields=[
+                        ClusterObjectFieldDescriptor(Label="powerSavings", Tag=0, Type=DemandResponseLoadControl.Enums.PowerSavingsEnum),
                     ])
 
-    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
+            powerSavings: 'DemandResponseLoadControl.Enums.PowerSavingsEnum' = 0
 
         @dataclass
-        class DegradationDirection(ClusterAttributeDescriptor):
+        class DutyCycleControlStruct(ClusterObject):
             @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000071
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="dutyCycle", Tag=0, Type=uint),
+                    ])
 
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000001
+            dutyCycle: 'uint' = 0
 
+        @dataclass
+        class AverageLoadControlStruct(ClusterObject):
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[HepaFilterMonitoring.Enums.DegradationDirectionEnum])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="loadAdjustment", Tag=0, Type=int),
+                    ])
 
-            value: 'typing.Optional[HepaFilterMonitoring.Enums.DegradationDirectionEnum]' = None
+            loadAdjustment: 'int' = 0
 
         @dataclass
-        class ChangeIndication(ClusterAttributeDescriptor):
+        class TemperatureControlStruct(ClusterObject):
             @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000071
+            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]),
+                    ])
 
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000002
+            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 attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=HepaFilterMonitoring.Enums.ChangeIndicationEnum)
+            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]),
+                    ])
 
-            value: 'HepaFilterMonitoring.Enums.ChangeIndicationEnum' = 0
+            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 InPlaceIndicator(ClusterAttributeDescriptor):
+        class LoadControlEventStruct(ClusterObject):
             @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000071
+            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]),
+                    ])
 
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000003
+            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 attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[bool])
+            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]),
+                    ])
 
-            value: 'typing.Optional[bool]' = None
+            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 LastChangedTime(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000071
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000004
+        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] = None
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="loadControlProgram", Tag=0, Type=DemandResponseLoadControl.Structs.LoadControlProgramStruct),
+                    ])
 
-            value: 'typing.Union[None, Nullable, uint]' = None
+            loadControlProgram: 'DemandResponseLoadControl.Structs.LoadControlProgramStruct' = field(default_factory=lambda: DemandResponseLoadControl.Structs.LoadControlProgramStruct())
 
         @dataclass
-        class ReplacementProductList(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000071
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x00000005
+        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] = None
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[HepaFilterMonitoring.Structs.ReplacementProductStruct]])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="loadControlProgramID", Tag=0, Type=bytes),
+                    ])
 
-            value: 'typing.Optional[typing.List[HepaFilterMonitoring.Structs.ReplacementProductStruct]]' = None
+            loadControlProgramID: 'bytes' = b""
 
         @dataclass
-        class GeneratedCommandList(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000071
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFF8
+        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] = None
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="event", Tag=0, Type=DemandResponseLoadControl.Structs.LoadControlEventStruct),
+                    ])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            event: 'DemandResponseLoadControl.Structs.LoadControlEventStruct' = field(default_factory=lambda: DemandResponseLoadControl.Structs.LoadControlEventStruct())
 
         @dataclass
-        class AcceptedCommandList(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000071
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFF9
+        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] = None
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        ClusterObjectFieldDescriptor(Label="eventID", Tag=0, Type=bytes),
+                        ClusterObjectFieldDescriptor(Label="cancelControl", Tag=1, Type=uint),
+                    ])
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            eventID: 'bytes' = b""
+            cancelControl: 'uint' = 0
 
         @dataclass
-        class EventList(ClusterAttributeDescriptor):
-            @ChipUtility.classproperty
-            def cluster_id(cls) -> int:
-                return 0x00000071
-
-            @ChipUtility.classproperty
-            def attribute_id(cls) -> int:
-                return 0x0000FFFA
+        class ClearLoadControlEventsRequest(ClusterCommand):
+            cluster_id: typing.ClassVar[int] = 0x00000096
+            command_id: typing.ClassVar[int] = 0x00000004
+            is_client: typing.ClassVar[bool] = True
+            response_type: typing.ClassVar[str] = None
 
             @ChipUtility.classproperty
-            def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
-
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                    ])
 
+    class Attributes:
         @dataclass
-        class AttributeList(ClusterAttributeDescriptor):
+        class DeviceClass(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000071
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFB
+                return 0x00000000
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.List[uint])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.List[uint]' = field(default_factory=lambda: [])
+            value: 'uint' = 0
 
         @dataclass
-        class FeatureMap(ClusterAttributeDescriptor):
+        class LoadControlPrograms(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000071
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFC
+                return 0x00000001
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=uint)
+                return ClusterObjectFieldDescriptor(Type=typing.List[DemandResponseLoadControl.Structs.LoadControlProgramStruct])
 
-            value: 'uint' = 0
+            value: 'typing.List[DemandResponseLoadControl.Structs.LoadControlProgramStruct]' = field(default_factory=lambda: [])
 
         @dataclass
-        class ClusterRevision(ClusterAttributeDescriptor):
+        class NumberOfLoadControlPrograms(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000071
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x0000FFFD
+                return 0x00000002
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
@@ -19966,210 +21985,107 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'uint' = 0
 
-
-@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 ReplacementProductStruct(ClusterObject):
-            @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),
-                    ])
-
-            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=[
-                    ])
-
-    class Attributes:
         @dataclass
-        class Condition(ClusterAttributeDescriptor):
+        class Events(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000000
+                return 0x00000003
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+                return ClusterObjectFieldDescriptor(Type=typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct])
 
-            value: 'typing.Optional[uint]' = None
+            value: 'typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct]' = field(default_factory=lambda: [])
 
         @dataclass
-        class DegradationDirection(ClusterAttributeDescriptor):
+        class ActiveEvents(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000001
+                return 0x00000004
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[ActivatedCarbonFilterMonitoring.Enums.DegradationDirectionEnum])
+                return ClusterObjectFieldDescriptor(Type=typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct])
 
-            value: 'typing.Optional[ActivatedCarbonFilterMonitoring.Enums.DegradationDirectionEnum]' = None
+            value: 'typing.List[DemandResponseLoadControl.Structs.LoadControlEventStruct]' = field(default_factory=lambda: [])
 
         @dataclass
-        class ChangeIndication(ClusterAttributeDescriptor):
+        class NumberOfEventsPerProgram(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000002
+                return 0x00000005
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=ActivatedCarbonFilterMonitoring.Enums.ChangeIndicationEnum)
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'ActivatedCarbonFilterMonitoring.Enums.ChangeIndicationEnum' = 0
+            value: 'uint' = 0
 
         @dataclass
-        class InPlaceIndicator(ClusterAttributeDescriptor):
+        class NumberOfTransistions(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000003
+                return 0x00000006
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[bool])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[bool]' = None
+            value: 'uint' = 0
 
         @dataclass
-        class LastChangedTime(ClusterAttributeDescriptor):
+        class DefaultRandomStart(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000004
+                return 0x00000007
 
             @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 ReplacementProductList(ClusterAttributeDescriptor):
+        class DefaultRandomDuration(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
-                return 0x00000005
+                return 0x00000008
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[ActivatedCarbonFilterMonitoring.Structs.ReplacementProductStruct]])
+                return ClusterObjectFieldDescriptor(Type=uint)
 
-            value: 'typing.Optional[typing.List[ActivatedCarbonFilterMonitoring.Structs.ReplacementProductStruct]]' = None
+            value: 'uint' = 0
 
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -20185,7 +22101,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AcceptedCommandList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -20201,7 +22117,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class EventList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -20217,7 +22133,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class AttributeList(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -20233,7 +22149,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class FeatureMap(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -20249,7 +22165,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
         class ClusterRevision(ClusterAttributeDescriptor):
             @ChipUtility.classproperty
             def cluster_id(cls) -> int:
-                return 0x00000072
+                return 0x00000096
 
             @ChipUtility.classproperty
             def attribute_id(cls) -> int:
@@ -20261,6 +22177,44 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
 
             value: 'uint' = 0
 
+    class Events:
+        @dataclass
+        class LoadControlEventStatusChange(ClusterEvent):
+            @ChipUtility.classproperty
+            def cluster_id(cls) -> int:
+                return 0x00000096
+
+            @ChipUtility.classproperty
+            def event_id(cls) -> int:
+                return 0x00000000
+
+            @ChipUtility.classproperty
+            def descriptor(cls) -> ClusterObjectDescriptor:
+                return ClusterObjectDescriptor(
+                    Fields=[
+                        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]),
+                    ])
+
+            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 DoorLock(Cluster):
@@ -25652,9 +27606,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]),
@@ -25663,9 +27617,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
@@ -25673,6 +27627,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):
@@ -25686,9 +27672,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):
@@ -25702,9 +27688,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):
@@ -25718,9 +27704,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):
@@ -32920,6 +34906,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]),
@@ -32929,6 +34916,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
@@ -32953,6 +34941,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
@@ -33383,7 +35387,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class TargetNavigatorStatusEnum(MatterIntEnum):
+        class StatusEnum(MatterIntEnum):
             kSuccess = 0x00
             kTargetNotFound = 0x01
             kNotAllowed = 0x02
@@ -33437,11 +35441,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:
@@ -34548,7 +36552,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
@@ -34592,10 +36596,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
@@ -34723,16 +36727,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
@@ -34763,12 +36757,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
 
@@ -34915,11 +36919,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:
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/credentials/CHIPCert.h b/src/credentials/CHIPCert.h
index e2cf99da5263c9..f59c6c36a59a27 100644
--- a/src/credentials/CHIPCert.h
+++ b/src/credentials/CHIPCert.h
@@ -49,7 +49,7 @@ 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;
 
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/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/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.mm b/src/darwin/Framework/CHIP/MTRDeviceController.mm
index 94b9a49173a49d..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>
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/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/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 1603541e5de222..2ad0831f77792f 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
@@ -3245,7 +3249,10 @@
               - 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:
               # StatusEnum was originally named MediaPlaybackStatusEnum, but we
               # generate the same API for the names with/without the cluster
@@ -3256,7 +3263,10 @@
               - 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
@@ -3320,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:
@@ -3995,7 +4009,10 @@
               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
@@ -4117,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
@@ -7444,7 +7464,6 @@
           Scenes:
               # New scenes bits not stable yet.
               - SceneTableSize
-              - RemainingCapacity
           FanControl:
               # New Fan Control bits not stable yet.
               - AirflowDirection
@@ -7717,6 +7736,7 @@
           GeneralDiagnostics:
               # Not in the spec yet.
               - AverageWearCount
+              # New things, not quite finalized.
   renames:
       enums:
           OTASoftwareUpdateProvider:
@@ -7751,7 +7771,15 @@
           WiFiNetworkDiagnostics:
               AssociationFailure:
                   - associationFailureCause
+      enums:
+          ContentLauncher:
+              - StatusEnum
       enum values:
+          ContentLauncher:
+              StatusEnum:
+                  - Success
+                  - URLNotAvailable
+                  - AuthFailed
           FanControl:
               FanModeSequenceEnum:
                   - OffHighAuto
@@ -7762,6 +7790,10 @@
               - NameSupportBitmap
           AdministratorCommissioning:
               - Feature
+          ContentLauncher:
+              - SupportedProtocolsBitmap
+          LevelControl:
+              - OptionsBitmap
       bitmap values:
           PumpConfigurationAndControl:
               PumpStatusBitmap:
@@ -7777,11 +7809,31 @@
           AdministratorCommissioning:
               Feature:
                   - Basic
+          ContentLauncher:
+              SupportedProtocolsBitmap:
+                  - DASH
+                  - HLS
+          LevelControl:
+              OptionsBitmap:
+                  - ExecuteIfOff
+                  - CoupleColorTempToLevel
+      attributes:
+          Scenes:
+              # Targeting Spring 2024 Matter release
+              - FabricSceneInfo
+      structs:
+          Scenes:
+              # Targeting Spring 2024 Matter release
+              - SceneInfoStruct
+
   deprecated:
       event fields:
           WiFiNetworkDiagnostics:
               AssociationFailure:
                   - associationFailure
+      enums:
+          ContentLauncher:
+              - ContentLaunchStatusEnum
       enum values:
           FanControl:
               FanModeSequenceEnum:
@@ -7790,6 +7842,10 @@
       bitmaps:
           Scenes:
               - ScenesCopyMode
+          ContentLauncher:
+              - SupportedStreamingProtocol
+          LevelControl:
+              - LevelControlOptions
       bitmap values:
           PumpConfigurationAndControl:
               PumpStatusBitmap:
@@ -7802,17 +7858,47 @@
           # Targeting Spring 2024 Matter release
           - MicrowaveOvenControl
           - MicrowaveOvenMode
+          - DemandResponseLoadControl
       attributes:
           NetworkCommissioning:
               # Targeting Spring 2024 Matter release
               - SupportedWiFiBands
               - SupportedThreadFeatures
               - ThreadVersion
+          WakeOnLAN:
+              # Targeting Spring 2024 Matter release
+              - LinkLocalAddress
       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
+      struct fields:
+          NetworkCommissioning:
+              # Targeting Spring 2024 Matter release
+              NetworkInfoStruct:
+                  - networkIdentifier
+                  - clientIdentifier
       bitmaps:
           NetworkCommissioning:
               # Targeting Spring 2024 Matter release
@@ -7822,12 +7908,27 @@
               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
       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
@@ -7842,6 +7943,10 @@
       bitmaps:
           Scenes:
               CopyModeBitmap: ScenesCopyMode
+          ContentLauncher:
+              SupportedProtocolsBitmap: SupportedStreamingProtocol
+          LevelControl:
+              OptionsBitmap: LevelControlOptions
       bitmap values:
           PumpConfigurationAndControl:
               PumpStatusBitmap:
@@ -7849,3 +7954,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/zap-generated/MTRAttributeSpecifiedCheck.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm
index 09cec3a90d5e73..93d825bbdbf865 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;
     }
@@ -1916,6 +1922,81 @@ 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 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 AttributeIsSpecifiedInModeSelectCluster(AttributeId aAttributeId)
 {
     using namespace Clusters::ModeSelect;
@@ -2660,6 +2741,156 @@ 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::DeviceClass::Id: {
+        return YES;
+    }
+    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::NumberOfTransistions::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 AttributeIsSpecifiedInDoorLockCluster(AttributeId aAttributeId)
 {
     using namespace Clusters::DoorLock;
@@ -4449,6 +4680,9 @@ static BOOL AttributeIsSpecifiedInWakeOnLANCluster(AttributeId aAttributeId)
     case Attributes::MACAddress::Id: {
         return YES;
     }
+    case Attributes::LinkLocalAddress::Id: {
+        return YES;
+    }
     case Attributes::GeneratedCommandList::Id: {
         return YES;
     }
@@ -5685,6 +5919,12 @@ BOOL MTRAttributeIsSpecified(ClusterId aClusterId, AttributeId aAttributeId)
     case Clusters::IcdManagement::Id: {
         return AttributeIsSpecifiedInICDManagementCluster(aAttributeId);
     }
+    case Clusters::Timer::Id: {
+        return AttributeIsSpecifiedInTimerCluster(aAttributeId);
+    }
+    case Clusters::OvenMode::Id: {
+        return AttributeIsSpecifiedInOvenModeCluster(aAttributeId);
+    }
     case Clusters::ModeSelect::Id: {
         return AttributeIsSpecifiedInModeSelectCluster(aAttributeId);
     }
@@ -5739,6 +5979,15 @@ 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::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 9f68fe6d8573f2..6b62937c80f566 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;
@@ -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;
     }
@@ -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();
@@ -2518,7 +2569,6 @@ static id _Nullable DecodeAttributeValueForNetworkCommissioningCluster(Attribute
         }
         return value;
     }
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SupportedWiFiBands::Id: {
         using TypeInfo = Attributes::SupportedWiFiBands::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -2545,8 +2595,6 @@ static id _Nullable DecodeAttributeValueForNetworkCommissioningCluster(Attribute
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SupportedThreadFeatures::Id: {
         using TypeInfo = Attributes::SupportedThreadFeatures::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -2558,8 +2606,6 @@ static id _Nullable DecodeAttributeValueForNetworkCommissioningCluster(Attribute
         value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::ThreadVersion::Id: {
         using TypeInfo = Attributes::ThreadVersion::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -2571,7 +2617,6 @@ static id _Nullable DecodeAttributeValueForNetworkCommissioningCluster(Attribute
         value = [NSNumber numberWithUnsignedShort:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -4114,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;
@@ -4130,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;
@@ -4143,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;
@@ -4156,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;
@@ -4176,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;
@@ -4198,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;
@@ -4238,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;
@@ -4273,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;
@@ -4290,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;
@@ -4303,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;
@@ -4316,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;
@@ -4329,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;
@@ -4342,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;
@@ -4355,7 +4375,6 @@ static id _Nullable DecodeAttributeValueForTimeSynchronizationCluster(AttributeI
         value = [NSNumber numberWithBool:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -5096,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;
@@ -5108,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;
@@ -5121,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;
@@ -5134,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;
@@ -5165,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;
@@ -5178,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;
@@ -5191,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;
@@ -5204,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;
@@ -5222,7 +5226,159 @@ static id _Nullable DecodeAttributeValueForICDManagementCluster(AttributeId aAtt
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeAttributeValueForTimerCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::Timer;
+    switch (aAttributeId) {
+    case Attributes::SetTime::Id: {
+        using TypeInfo = Attributes::SetTime::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::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;
+    }
+    default: {
+        break;
+    }
+    }
+
+    *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB;
+    return nil;
+}
+static id _Nullable DecodeAttributeValueForOvenModeCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
+{
+    using namespace Clusters::OvenMode;
+    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();
+                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;
+                    *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();
+                        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 {
+                            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;
     }
@@ -5370,7 +5526,6 @@ static id _Nullable DecodeAttributeValueForLaundryWasherModeCluster(AttributeId
 {
     using namespace Clusters::LaundryWasherMode;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SupportedModes::Id: {
         using TypeInfo = Attributes::SupportedModes::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5426,8 +5581,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;
@@ -5439,8 +5592,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;
@@ -5456,8 +5607,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;
@@ -5473,7 +5622,6 @@ static id _Nullable DecodeAttributeValueForLaundryWasherModeCluster(AttributeId
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -5486,7 +5634,6 @@ static id _Nullable DecodeAttributeValueForRefrigeratorAndTemperatureControlledC
 {
     using namespace Clusters::RefrigeratorAndTemperatureControlledCabinetMode;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SupportedModes::Id: {
         using TypeInfo = Attributes::SupportedModes::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5542,8 +5689,6 @@ static id _Nullable DecodeAttributeValueForRefrigeratorAndTemperatureControlledC
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::CurrentMode::Id: {
         using TypeInfo = Attributes::CurrentMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5555,8 +5700,6 @@ static id _Nullable DecodeAttributeValueForRefrigeratorAndTemperatureControlledC
         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;
@@ -5572,8 +5715,6 @@ static id _Nullable DecodeAttributeValueForRefrigeratorAndTemperatureControlledC
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::OnMode::Id: {
         using TypeInfo = Attributes::OnMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5589,7 +5730,6 @@ static id _Nullable DecodeAttributeValueForRefrigeratorAndTemperatureControlledC
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -5602,7 +5742,6 @@ static id _Nullable DecodeAttributeValueForLaundryWasherControlsCluster(Attribut
 {
     using namespace Clusters::LaundryWasherControls;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SpinSpeeds::Id: {
         using TypeInfo = Attributes::SpinSpeeds::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5634,8 +5773,6 @@ static id _Nullable DecodeAttributeValueForLaundryWasherControlsCluster(Attribut
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SpinSpeedCurrent::Id: {
         using TypeInfo = Attributes::SpinSpeedCurrent::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5651,8 +5788,6 @@ static id _Nullable DecodeAttributeValueForLaundryWasherControlsCluster(Attribut
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::NumberOfRinses::Id: {
         using TypeInfo = Attributes::NumberOfRinses::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5664,8 +5799,6 @@ static id _Nullable DecodeAttributeValueForLaundryWasherControlsCluster(Attribut
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SupportedRinses::Id: {
         using TypeInfo = Attributes::SupportedRinses::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5692,7 +5825,6 @@ static id _Nullable DecodeAttributeValueForLaundryWasherControlsCluster(Attribut
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -5705,7 +5837,6 @@ static id _Nullable DecodeAttributeValueForRVCRunModeCluster(AttributeId aAttrib
 {
     using namespace Clusters::RvcRunMode;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SupportedModes::Id: {
         using TypeInfo = Attributes::SupportedModes::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5761,8 +5892,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;
@@ -5774,8 +5903,6 @@ static id _Nullable DecodeAttributeValueForRVCRunModeCluster(AttributeId aAttrib
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::OnMode::Id: {
         using TypeInfo = Attributes::OnMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5791,7 +5918,6 @@ static id _Nullable DecodeAttributeValueForRVCRunModeCluster(AttributeId aAttrib
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -5804,7 +5930,6 @@ static id _Nullable DecodeAttributeValueForRVCCleanModeCluster(AttributeId aAttr
 {
     using namespace Clusters::RvcCleanMode;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SupportedModes::Id: {
         using TypeInfo = Attributes::SupportedModes::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5860,8 +5985,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;
@@ -5873,8 +5996,6 @@ static id _Nullable DecodeAttributeValueForRVCCleanModeCluster(AttributeId aAttr
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::OnMode::Id: {
         using TypeInfo = Attributes::OnMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5890,7 +6011,6 @@ static id _Nullable DecodeAttributeValueForRVCCleanModeCluster(AttributeId aAttr
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -5903,7 +6023,6 @@ static id _Nullable DecodeAttributeValueForTemperatureControlCluster(AttributeId
 {
     using namespace Clusters::TemperatureControl;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::TemperatureSetpoint::Id: {
         using TypeInfo = Attributes::TemperatureSetpoint::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5915,8 +6034,6 @@ static id _Nullable DecodeAttributeValueForTemperatureControlCluster(AttributeId
         value = [NSNumber numberWithShort:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MinTemperature::Id: {
         using TypeInfo = Attributes::MinTemperature::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5928,8 +6045,6 @@ static id _Nullable DecodeAttributeValueForTemperatureControlCluster(AttributeId
         value = [NSNumber numberWithShort:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MaxTemperature::Id: {
         using TypeInfo = Attributes::MaxTemperature::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5941,8 +6056,6 @@ static id _Nullable DecodeAttributeValueForTemperatureControlCluster(AttributeId
         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;
@@ -5954,8 +6067,6 @@ static id _Nullable DecodeAttributeValueForTemperatureControlCluster(AttributeId
         value = [NSNumber numberWithShort:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SelectedTemperatureLevel::Id: {
         using TypeInfo = Attributes::SelectedTemperatureLevel::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -5967,8 +6078,6 @@ static id _Nullable DecodeAttributeValueForTemperatureControlCluster(AttributeId
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SupportedTemperatureLevels::Id: {
         using TypeInfo = Attributes::SupportedTemperatureLevels::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6000,7 +6109,6 @@ static id _Nullable DecodeAttributeValueForTemperatureControlCluster(AttributeId
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -6013,7 +6121,6 @@ static id _Nullable DecodeAttributeValueForRefrigeratorAlarmCluster(AttributeId
 {
     using namespace Clusters::RefrigeratorAlarm;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::Mask::Id: {
         using TypeInfo = Attributes::Mask::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6025,8 +6132,6 @@ static id _Nullable DecodeAttributeValueForRefrigeratorAlarmCluster(AttributeId
         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;
@@ -6038,8 +6143,6 @@ static id _Nullable DecodeAttributeValueForRefrigeratorAlarmCluster(AttributeId
         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;
@@ -6051,7 +6154,6 @@ static id _Nullable DecodeAttributeValueForRefrigeratorAlarmCluster(AttributeId
         value = [NSNumber numberWithUnsignedInt:cppValue.Raw()];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -6064,7 +6166,6 @@ static id _Nullable DecodeAttributeValueForDishwasherModeCluster(AttributeId aAt
 {
     using namespace Clusters::DishwasherMode;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SupportedModes::Id: {
         using TypeInfo = Attributes::SupportedModes::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6120,8 +6221,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;
@@ -6133,8 +6232,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;
@@ -6150,8 +6247,6 @@ static id _Nullable DecodeAttributeValueForDishwasherModeCluster(AttributeId aAt
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::OnMode::Id: {
         using TypeInfo = Attributes::OnMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6167,7 +6262,6 @@ static id _Nullable DecodeAttributeValueForDishwasherModeCluster(AttributeId aAt
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -6180,7 +6274,6 @@ static id _Nullable DecodeAttributeValueForAirQualityCluster(AttributeId aAttrib
 {
     using namespace Clusters::AirQuality;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::AirQuality::Id: {
         using TypeInfo = Attributes::AirQuality::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6192,7 +6285,6 @@ static id _Nullable DecodeAttributeValueForAirQualityCluster(AttributeId aAttrib
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -6205,7 +6297,6 @@ static id _Nullable DecodeAttributeValueForSmokeCOAlarmCluster(AttributeId aAttr
 {
     using namespace Clusters::SmokeCoAlarm;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::ExpressedState::Id: {
         using TypeInfo = Attributes::ExpressedState::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6217,8 +6308,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::SmokeState::Id: {
         using TypeInfo = Attributes::SmokeState::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6230,8 +6319,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::COState::Id: {
         using TypeInfo = Attributes::COState::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6243,8 +6330,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::BatteryAlert::Id: {
         using TypeInfo = Attributes::BatteryAlert::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6256,8 +6341,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::DeviceMuted::Id: {
         using TypeInfo = Attributes::DeviceMuted::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6269,8 +6352,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::TestInProgress::Id: {
         using TypeInfo = Attributes::TestInProgress::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6282,8 +6363,6 @@ static id _Nullable DecodeAttributeValueForSmokeCOAlarmCluster(AttributeId aAttr
         value = [NSNumber numberWithBool:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::HardwareFaultAlert::Id: {
         using TypeInfo = Attributes::HardwareFaultAlert::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6295,8 +6374,6 @@ static id _Nullable DecodeAttributeValueForSmokeCOAlarmCluster(AttributeId aAttr
         value = [NSNumber numberWithBool:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::EndOfServiceAlert::Id: {
         using TypeInfo = Attributes::EndOfServiceAlert::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6308,8 +6385,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::InterconnectSmokeAlarm::Id: {
         using TypeInfo = Attributes::InterconnectSmokeAlarm::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6321,8 +6396,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::InterconnectCOAlarm::Id: {
         using TypeInfo = Attributes::InterconnectCOAlarm::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6334,8 +6407,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;
@@ -6347,8 +6418,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;
@@ -6360,8 +6429,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;
@@ -6373,7 +6440,6 @@ static id _Nullable DecodeAttributeValueForSmokeCOAlarmCluster(AttributeId aAttr
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -6386,7 +6452,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;
@@ -6398,8 +6463,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;
@@ -6411,8 +6474,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;
@@ -6424,8 +6485,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;
@@ -6437,7 +6496,6 @@ static id _Nullable DecodeAttributeValueForDishwasherAlarmCluster(AttributeId aA
         value = [NSNumber numberWithUnsignedInt:cppValue.Raw()];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -6450,7 +6508,6 @@ static id _Nullable DecodeAttributeValueForMicrowaveOvenModeCluster(AttributeId
 {
     using namespace Clusters::MicrowaveOvenMode;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::SupportedModes::Id: {
         using TypeInfo = Attributes::SupportedModes::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6506,8 +6563,6 @@ static id _Nullable DecodeAttributeValueForMicrowaveOvenModeCluster(AttributeId
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::CurrentMode::Id: {
         using TypeInfo = Attributes::CurrentMode::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6519,7 +6574,6 @@ static id _Nullable DecodeAttributeValueForMicrowaveOvenModeCluster(AttributeId
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -6532,7 +6586,6 @@ static id _Nullable DecodeAttributeValueForMicrowaveOvenControlCluster(Attribute
 {
     using namespace Clusters::MicrowaveOvenControl;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::CookTime::Id: {
         using TypeInfo = Attributes::CookTime::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6544,8 +6597,6 @@ static id _Nullable DecodeAttributeValueForMicrowaveOvenControlCluster(Attribute
         value = [NSNumber numberWithUnsignedInt:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PowerSetting::Id: {
         using TypeInfo = Attributes::PowerSetting::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6557,8 +6608,6 @@ static id _Nullable DecodeAttributeValueForMicrowaveOvenControlCluster(Attribute
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MinPower::Id: {
         using TypeInfo = Attributes::MinPower::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6570,8 +6619,6 @@ static id _Nullable DecodeAttributeValueForMicrowaveOvenControlCluster(Attribute
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::MaxPower::Id: {
         using TypeInfo = Attributes::MaxPower::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6583,8 +6630,6 @@ static id _Nullable DecodeAttributeValueForMicrowaveOvenControlCluster(Attribute
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PowerStep::Id: {
         using TypeInfo = Attributes::PowerStep::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6596,7 +6641,6 @@ static id _Nullable DecodeAttributeValueForMicrowaveOvenControlCluster(Attribute
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -6609,7 +6653,6 @@ static id _Nullable DecodeAttributeValueForOperationalStateCluster(AttributeId a
 {
     using namespace Clusters::OperationalState;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PhaseList::Id: {
         using TypeInfo = Attributes::PhaseList::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6645,8 +6688,6 @@ static id _Nullable DecodeAttributeValueForOperationalStateCluster(AttributeId a
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::CurrentPhase::Id: {
         using TypeInfo = Attributes::CurrentPhase::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6662,8 +6703,6 @@ static id _Nullable DecodeAttributeValueForOperationalStateCluster(AttributeId a
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::CountdownTime::Id: {
         using TypeInfo = Attributes::CountdownTime::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6679,8 +6718,6 @@ static id _Nullable DecodeAttributeValueForOperationalStateCluster(AttributeId a
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::OperationalStateList::Id: {
         using TypeInfo = Attributes::OperationalStateList::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6718,8 +6755,6 @@ 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;
         TypeInfo::DecodableType cppValue;
@@ -6731,8 +6766,6 @@ static id _Nullable DecodeAttributeValueForOperationalStateCluster(AttributeId a
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::OperationalError::Id: {
         using TypeInfo = Attributes::OperationalError::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6765,7 +6798,6 @@ static id _Nullable DecodeAttributeValueForOperationalStateCluster(AttributeId a
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -6778,7 +6810,6 @@ static id _Nullable DecodeAttributeValueForRVCOperationalStateCluster(AttributeI
 {
     using namespace Clusters::RvcOperationalState;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::PhaseList::Id: {
         using TypeInfo = Attributes::PhaseList::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6814,8 +6845,6 @@ static id _Nullable DecodeAttributeValueForRVCOperationalStateCluster(AttributeI
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::CurrentPhase::Id: {
         using TypeInfo = Attributes::CurrentPhase::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6831,8 +6860,6 @@ static id _Nullable DecodeAttributeValueForRVCOperationalStateCluster(AttributeI
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::CountdownTime::Id: {
         using TypeInfo = Attributes::CountdownTime::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6848,8 +6875,6 @@ static id _Nullable DecodeAttributeValueForRVCOperationalStateCluster(AttributeI
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::OperationalStateList::Id: {
         using TypeInfo = Attributes::OperationalStateList::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6887,8 +6912,6 @@ static id _Nullable DecodeAttributeValueForRVCOperationalStateCluster(AttributeI
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::OperationalState::Id: {
         using TypeInfo = Attributes::OperationalState::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6900,8 +6923,6 @@ static id _Nullable DecodeAttributeValueForRVCOperationalStateCluster(AttributeI
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::OperationalError::Id: {
         using TypeInfo = Attributes::OperationalError::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6934,7 +6955,6 @@ static id _Nullable DecodeAttributeValueForRVCOperationalStateCluster(AttributeI
         }
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -6947,7 +6967,6 @@ static id _Nullable DecodeAttributeValueForHEPAFilterMonitoringCluster(Attribute
 {
     using namespace Clusters::HepaFilterMonitoring;
     switch (aAttributeId) {
-#if MTR_ENABLE_PROVISIONAL
     case Attributes::Condition::Id: {
         using TypeInfo = Attributes::Condition::TypeInfo;
         TypeInfo::DecodableType cppValue;
@@ -6955,70 +6974,430 @@ static id _Nullable DecodeAttributeValueForHEPAFilterMonitoringCluster(Attribute
         if (*aError != CHIP_NO_ERROR) {
             return nil;
         }
-        NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:cppValue];
+        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;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::DegradationDirection::Id: {
-        using TypeInfo = Attributes::DegradationDirection::TypeInfo;
+    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 * _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::OpenLevel::Id: {
+        using TypeInfo = Attributes::OpenLevel::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::InPlaceIndicator::Id: {
-        using TypeInfo = Attributes::InPlaceIndicator::TypeInfo;
+    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 numberWithBool:cppValue];
+        value = [NSNumber numberWithUnsignedShort:cppValue.Raw()];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::LastChangedTime::Id: {
-        using TypeInfo = Attributes::LastChangedTime::TypeInfo;
+    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::DeviceClass::Id: {
+        using TypeInfo = Attributes::DeviceClass::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()];
-        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedInt:cppValue.Raw()];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::ReplacementProductList::Id: {
-        using TypeInfo = Attributes::ReplacementProductList::TypeInfo;
+    case Attributes::LoadControlPrograms::Id: {
+        using TypeInfo = Attributes::LoadControlPrograms::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
@@ -7030,15 +7409,30 @@ static id _Nullable DecodeAttributeValueForHEPAFilterMonitoringCluster(Attribute
             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) {
+                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();
@@ -7050,22 +7444,8 @@ static id _Nullable DecodeAttributeValueForHEPAFilterMonitoringCluster(Attribute
         }
         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::NumberOfLoadControlPrograms::Id: {
+        using TypeInfo = Attributes::NumberOfLoadControlPrograms::TypeInfo;
         TypeInfo::DecodableType cppValue;
         *aError = DataModel::Decode(aReader, cppValue);
         if (*aError != CHIP_NO_ERROR) {
@@ -7075,98 +7455,306 @@ static id _Nullable DecodeAttributeValueForActivatedCarbonFilterMonitoringCluste
         value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::DegradationDirection::Id: {
-        using TypeInfo = Attributes::DegradationDirection::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 * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(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();
+                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:chip::to_underlying(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::ChangeIndication::Id: {
-        using TypeInfo = Attributes::ChangeIndication::TypeInfo;
+    case Attributes::ActiveEvents::Id: {
+        using TypeInfo = Attributes::ActiveEvents::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)];
+        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:chip::to_underlying(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::InPlaceIndicator::Id: {
-        using TypeInfo = Attributes::InPlaceIndicator::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 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::NumberOfTransistions::Id: {
+        using TypeInfo = Attributes::NumberOfTransistions::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()];
-        }
+        NSNumber * _Nonnull value;
+        value = [NSNumber numberWithUnsignedChar:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-    case Attributes::ReplacementProductList::Id: {
-        using TypeInfo = Attributes::ReplacementProductList::TypeInfo;
+    case Attributes::DefaultRandomStart::Id: {
+        using TypeInfo = Attributes::DefaultRandomStart::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;
+        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;
     }
@@ -9069,7 +9657,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;
@@ -9081,7 +9668,6 @@ static id _Nullable DecodeAttributeValueForFanControlCluster(AttributeId aAttrib
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -9102,7 +9688,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: {
@@ -9113,7 +9699,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: {
@@ -9124,7 +9710,7 @@ static id _Nullable DecodeAttributeValueForThermostatUserInterfaceConfigurationC
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedChar:cppValue];
+        value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
     default: {
@@ -10534,7 +11120,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;
@@ -10550,8 +11135,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;
@@ -10567,8 +11150,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;
@@ -10584,8 +11165,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;
@@ -10601,8 +11180,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;
@@ -10614,8 +11191,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;
@@ -10631,8 +11206,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;
@@ -10644,8 +11217,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;
@@ -10657,8 +11228,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;
@@ -10670,8 +11239,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;
@@ -10683,8 +11250,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;
@@ -10696,7 +11261,6 @@ static id _Nullable DecodeAttributeValueForCarbonMonoxideConcentrationMeasuremen
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -10709,7 +11273,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;
@@ -10725,8 +11288,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;
@@ -10742,8 +11303,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;
@@ -10759,8 +11318,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;
@@ -10776,8 +11333,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;
@@ -10789,8 +11344,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;
@@ -10806,8 +11359,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;
@@ -10819,8 +11370,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;
@@ -10832,8 +11381,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;
@@ -10845,8 +11392,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;
@@ -10858,8 +11403,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;
@@ -10871,7 +11414,6 @@ static id _Nullable DecodeAttributeValueForCarbonDioxideConcentrationMeasurement
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -10884,7 +11426,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;
@@ -10900,8 +11441,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;
@@ -10917,8 +11456,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;
@@ -10934,8 +11471,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;
@@ -10951,8 +11486,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;
@@ -10964,8 +11497,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;
@@ -10981,8 +11512,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;
@@ -10994,8 +11523,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;
@@ -11007,8 +11534,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;
@@ -11020,8 +11545,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;
@@ -11033,8 +11556,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;
@@ -11046,7 +11567,6 @@ static id _Nullable DecodeAttributeValueForNitrogenDioxideConcentrationMeasureme
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -11059,7 +11579,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;
@@ -11075,8 +11594,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;
@@ -11092,8 +11609,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;
@@ -11109,8 +11624,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;
@@ -11126,8 +11639,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;
@@ -11139,8 +11650,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;
@@ -11156,8 +11665,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;
@@ -11169,8 +11676,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;
@@ -11182,8 +11687,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;
@@ -11195,8 +11698,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;
@@ -11208,8 +11709,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;
@@ -11221,7 +11720,6 @@ static id _Nullable DecodeAttributeValueForOzoneConcentrationMeasurementCluster(
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -11234,7 +11732,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;
@@ -11250,8 +11747,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;
@@ -11267,8 +11762,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;
@@ -11284,8 +11777,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;
@@ -11301,8 +11792,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;
@@ -11314,8 +11803,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;
@@ -11331,8 +11818,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;
@@ -11344,8 +11829,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;
@@ -11357,8 +11840,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;
@@ -11370,8 +11851,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;
@@ -11383,8 +11862,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;
@@ -11396,7 +11873,6 @@ static id _Nullable DecodeAttributeValueForPM25ConcentrationMeasurementCluster(A
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -11409,7 +11885,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;
@@ -11425,8 +11900,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;
@@ -11442,8 +11915,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;
@@ -11459,8 +11930,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;
@@ -11476,8 +11945,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;
@@ -11489,8 +11956,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;
@@ -11506,8 +11971,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;
@@ -11519,8 +11982,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;
@@ -11532,8 +11993,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;
@@ -11545,8 +12004,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;
@@ -11558,8 +12015,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;
@@ -11571,7 +12026,6 @@ static id _Nullable DecodeAttributeValueForFormaldehydeConcentrationMeasurementC
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -11584,7 +12038,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;
@@ -11600,8 +12053,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;
@@ -11617,8 +12068,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;
@@ -11634,8 +12083,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;
@@ -11651,8 +12098,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;
@@ -11664,8 +12109,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;
@@ -11681,8 +12124,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;
@@ -11694,8 +12135,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;
@@ -11707,8 +12146,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;
@@ -11720,8 +12157,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;
@@ -11733,8 +12168,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;
@@ -11746,7 +12179,6 @@ static id _Nullable DecodeAttributeValueForPM1ConcentrationMeasurementCluster(At
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -11759,7 +12191,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;
@@ -11775,8 +12206,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;
@@ -11792,8 +12221,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;
@@ -11809,8 +12236,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;
@@ -11826,8 +12251,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;
@@ -11839,8 +12262,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;
@@ -11856,8 +12277,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;
@@ -11869,8 +12288,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;
@@ -11882,8 +12299,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;
@@ -11895,8 +12310,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;
@@ -11908,8 +12321,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;
@@ -11921,7 +12332,6 @@ static id _Nullable DecodeAttributeValueForPM10ConcentrationMeasurementCluster(A
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -11934,7 +12344,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;
@@ -11950,8 +12359,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;
@@ -11967,8 +12374,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;
@@ -11984,8 +12389,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;
@@ -12001,8 +12404,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;
@@ -12014,8 +12415,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;
@@ -12031,8 +12430,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;
@@ -12044,8 +12441,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;
@@ -12057,8 +12452,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;
@@ -12070,8 +12463,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;
@@ -12083,8 +12474,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;
@@ -12096,7 +12485,6 @@ static id _Nullable DecodeAttributeValueForTotalVolatileOrganicCompoundsConcentr
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -12109,7 +12497,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;
@@ -12125,8 +12512,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;
@@ -12142,8 +12527,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;
@@ -12159,8 +12542,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;
@@ -12176,8 +12557,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;
@@ -12189,8 +12568,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;
@@ -12206,8 +12583,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;
@@ -12219,8 +12594,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;
@@ -12232,8 +12605,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;
@@ -12245,8 +12616,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;
@@ -12258,8 +12627,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;
@@ -12271,7 +12638,6 @@ static id _Nullable DecodeAttributeValueForRadonConcentrationMeasurementCluster(
         value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -12300,6 +12666,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;
     }
@@ -12768,7 +13145,7 @@ static id _Nullable DecodeAttributeValueForContentLauncherCluster(AttributeId aA
             return nil;
         }
         NSNumber * _Nonnull value;
-        value = [NSNumber numberWithUnsignedInt:cppValue];
+        value = [NSNumber numberWithUnsignedInt:cppValue.Raw()];
         return value;
     }
     default: {
@@ -15886,7 +16263,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;
@@ -15898,7 +16274,6 @@ static id _Nullable DecodeAttributeValueForSampleMEICluster(AttributeId aAttribu
         value = [NSNumber numberWithBool:cppValue];
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -16029,6 +16404,12 @@ 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::OvenMode::Id: {
+        return DecodeAttributeValueForOvenModeCluster(aPath.mAttributeId, aReader, aError);
+    }
     case Clusters::ModeSelect::Id: {
         return DecodeAttributeValueForModeSelectCluster(aPath.mAttributeId, aReader, aError);
     }
@@ -16083,6 +16464,15 @@ 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::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 8a7f4e880dec13..b0b89b206e96e1 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -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_NEWLY_AVAILABLE;
+- (void)subscribeAttributeFabricSceneInfoWithParams:(MTRSubscribeParams *)params
+                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_NEWLY_AVAILABLE;
++ (void)readAttributeFabricSceneInfoWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_NEWLY_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
@@ -1558,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
@@ -2499,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
@@ -4740,6 +4758,209 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
+/**
+ * Cluster Timer
+ *
+ * This cluster supports creating a simple timer functionality.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterTimer : MTRGenericBaseCluster
+
+/**
+ * Command SetTimer
+ *
+ * This command is used to set the timer.
+ */
+- (void)setTimerWithParams:(MTRTimerClusterSetTimerParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command ResetTimer
+ *
+ * This command is used to reset the timer to the original value.
+ */
+- (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)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)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)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
+                                 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 MTRBaseClusterTimer (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 Oven Mode
+ *
+ * Attributes and commands for selecting a mode from a list of supported options.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterOvenMode : 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:(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
+                           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 MTRBaseClusterOvenMode (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 Mode Select
  *
@@ -6236,57 +6457,369 @@ MTR_PROVISIONALLY_AVAILABLE
 - (void)stopWithCompletion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
     MTR_PROVISIONALLY_AVAILABLE;
 /**
- * Command Start
+ * 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
  *
- * 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 cluster is used to configure a boolean sensor.
  */
-- (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;
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRBaseClusterBooleanSensorConfiguration : MTRGenericBaseCluster
+
 /**
- * Command Resume
+ * Command SuppressRequest
  *
- * 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 suppress the specified alarm.
  */
-- (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)suppressRequestWithParams:(MTRBooleanSensorConfigurationClusterSuppressRequestParams *)params completion:(MTRStatusCompletion)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)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)readAttributeSensitivityLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _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)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)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)readAttributeAlarmsActiveWithClusterStateCache:(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
+- (void)readAttributeAlarmsSuppressedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeAlarmsSuppressedWithParams:(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)readAttributeAlarmsSuppressedWithClusterStateCache:(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)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
@@ -6329,7 +6862,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-@interface MTRBaseClusterRVCOperationalState (Availability)
+@interface MTRBaseClusterBooleanSensorConfiguration (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -6342,59 +6875,99 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 /**
- * Cluster HEPA Filter Monitoring
+ * Cluster Valve Configuration and Control
  *
- * Attributes and commands for monitoring HEPA filters in a device
+ * This cluster is used to configure a valve.
  */
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterHEPAFilterMonitoring : MTRGenericBaseCluster
+@interface MTRBaseClusterValveConfigurationAndControl : MTRGenericBaseCluster
 
 /**
- * Command ResetCondition
+ * Command Open
  *
- * Reset the condition of the replaceable to the non degraded state
+ * This command is used to set the valve to its fully open position.
  */
-- (void)resetConditionWithParams:(MTRHEPAFilterMonitoringClusterResetConditionParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)resetConditionWithCompletion:(MTRStatusCompletion)completion
+- (void)openWithParams:(MTRValveConfigurationAndControlClusterOpenParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command Close
+ *
+ * This command is used to set the valve to its fully closed position.
+ */
+- (void)closeWithParams:(MTRValveConfigurationAndControlClusterCloseParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)closeWithCompletion:(MTRStatusCompletion)completion
     MTR_PROVISIONALLY_AVAILABLE;
+/**
+ * Command SetLevel
+ *
+ * This command is used to set the valve to a specific level.
+ */
+- (void)setLevelWithParams:(MTRValveConfigurationAndControlClusterSetLevelParams *)params completion:(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)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)readAttributeOpenDurationWithClusterStateCache:(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)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)readAttributeAutoCloseTimeWithClusterStateCache:(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)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)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)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)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)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)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)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
@@ -6437,7 +7010,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-@interface MTRBaseClusterHEPAFilterMonitoring (Availability)
+@interface MTRBaseClusterValveConfigurationAndControl (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -6450,59 +7023,103 @@ MTR_PROVISIONALLY_AVAILABLE
 @end
 
 /**
- * Cluster Activated Carbon Filter Monitoring
+ * Cluster Demand Response Load Control
  *
- * Attributes and commands for monitoring activated carbon filters in a device
+ * This cluster provides an interface to the functionality of Smart Energy Demand Response and Load Control.
  */
 MTR_PROVISIONALLY_AVAILABLE
-@interface MTRBaseClusterActivatedCarbonFilterMonitoring : MTRGenericBaseCluster
+@interface MTRBaseClusterDemandResponseLoadControl : MTRGenericBaseCluster
 
 /**
- * Command ResetCondition
+ * Command RegisterLoadControlProgramRequest
  *
- * Reset the condition of the replaceable to the non degraded state
+ * 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)resetConditionWithParams:(MTRActivatedCarbonFilterMonitoringClusterResetConditionParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE;
-- (void)resetConditionWithCompletion:(MTRStatusCompletion)completion
+- (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)readAttributeDeviceClassWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeDeviceClassWithParams:(MTRSubscribeParams *)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeDeviceClassWithClusterStateCache:(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)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)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)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)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)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)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)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)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)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)readAttributeNumberOfTransistionsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE;
+- (void)subscribeAttributeNumberOfTransistionsWithParams:(MTRSubscribeParams *)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE;
++ (void)readAttributeNumberOfTransistionsWithClusterStateCache:(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
@@ -6545,7 +7162,7 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
-@interface MTRBaseClusterActivatedCarbonFilterMonitoring (Availability)
+@interface MTRBaseClusterDemandResponseLoadControl (Availability)
 
 /**
  * For all instance methods (reads, writes, commands) that take a completion,
@@ -10834,6 +11451,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
@@ -13913,10 +14536,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,
@@ -14392,6 +15025,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) {
@@ -14408,6 +15042,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) {
@@ -14858,6 +15493,33 @@ 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(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_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,
@@ -15115,6 +15777,129 @@ 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_ENUM(uint8_t, MTRDemandResponseLoadControlPowerSavings) {
+    MTRDemandResponseLoadControlPowerSavingsLow MTR_PROVISIONALLY_AVAILABLE = 0x00,
+    MTRDemandResponseLoadControlPowerSavingsMedium MTR_PROVISIONALLY_AVAILABLE = 0x01,
+    MTRDemandResponseLoadControlPowerSavingsHigh MTR_PROVISIONALLY_AVAILABLE = 0x02,
+} 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, 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,
@@ -15894,6 +16679,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_PROVISIONALLY_AVAILABLE = 0x00,
+    MTRThermostatUserInterfaceConfigurationKeypadLockoutLockout1 MTR_PROVISIONALLY_AVAILABLE = 0x01,
+    MTRThermostatUserInterfaceConfigurationKeypadLockoutLockout2 MTR_PROVISIONALLY_AVAILABLE = 0x02,
+    MTRThermostatUserInterfaceConfigurationKeypadLockoutLockout3 MTR_PROVISIONALLY_AVAILABLE = 0x03,
+    MTRThermostatUserInterfaceConfigurationKeypadLockoutLockout4 MTR_PROVISIONALLY_AVAILABLE = 0x04,
+    MTRThermostatUserInterfaceConfigurationKeypadLockoutLockout5 MTR_PROVISIONALLY_AVAILABLE = 0x05,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTRThermostatUserInterfaceConfigurationScheduleProgrammingVisibility) {
+    MTRThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityScheduleProgrammingPermitted MTR_PROVISIONALLY_AVAILABLE = 0x00,
+    MTRThermostatUserInterfaceConfigurationScheduleProgrammingVisibilityScheduleProgrammingDenied MTR_PROVISIONALLY_AVAILABLE = 0x01,
+} MTR_PROVISIONALLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTRThermostatUserInterfaceConfigurationTemperatureDisplayMode) {
+    MTRThermostatUserInterfaceConfigurationTemperatureDisplayModeCelsius MTR_PROVISIONALLY_AVAILABLE = 0x00,
+    MTRThermostatUserInterfaceConfigurationTemperatureDisplayModeFahrenheit MTR_PROVISIONALLY_AVAILABLE = 0x01,
+} MTR_PROVISIONALLY_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,
@@ -16509,12 +17313,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,
@@ -16539,15 +17337,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 f30f7792eb7f72..580d0ad08415de 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
@@ -1872,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())
@@ -1897,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()
@@ -11752,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;
@@ -20137,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
 {
@@ -38683,12 +38779,12 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @end
 
-@implementation MTRBaseClusterModeSelect
+@implementation MTRBaseClusterTimer
 
-- (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params completion:(MTRStatusCompletion)completion
+- (void)setTimerWithParams:(MTRTimerClusterSetTimerParams *)params completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRModeSelectClusterChangeToModeParams
+        params = [[MTRTimerClusterSetTimerParams
             alloc] init];
     }
 
@@ -38698,7 +38794,7 @@ - (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = ModeSelect::Commands::ChangeToMode::Type;
+    using RequestType = Timer::Commands::SetTimer::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -38709,10 +38805,86 @@ - (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params
                                              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];
+    }
 
-- (void)readAttributeDescriptionWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion
+    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
 {
-    using TypeInfo = ModeSelect::Attributes::Description::TypeInfo;
+    if (params == nil) {
+        params = [[MTRTimerClusterAddTimeParams
+            alloc] init];
+    }
+
+    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 = [[MTRTimerClusterReduceTimeParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    using RequestType = Timer::Commands::ReduceTime::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)readAttributeSetTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = Timer::Attributes::SetTime::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -38721,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())
@@ -38735,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()
@@ -38746,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())
@@ -38757,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())
@@ -38771,9 +38943,81 @@ - (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()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeTimerStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = Timer::Attributes::TimerState::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeTimerStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = Timer::Attributes::TimerState::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeTimerStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = Timer::Attributes::TimerState::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 = Timer::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 = Timer::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 = Timer::Attributes::GeneratedCommandList::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -38782,9 +39026,218 @@ + (void)readAttributeStandardNamespaceWithClusterStateCache:(MTRClusterStateCach
                                      completion:completion];
 }
 
+- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = Timer::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 = Timer::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 = Timer::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 = Timer::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 = 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)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];
+}
+
+- (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)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = Timer::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 = Timer::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 = Timer::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 = Timer::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 = Timer::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 = Timer::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 = Timer::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 = Timer::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];
+    }
+
+    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)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::SupportedModes::TypeInfo;
+    using TypeInfo = OvenMode::Attributes::SupportedModes::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -38797,7 +39250,7 @@ - (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnul
                            subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                      reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ModeSelect::Attributes::SupportedModes::TypeInfo;
+    using TypeInfo = OvenMode::Attributes::SupportedModes::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -38809,7 +39262,7 @@ - (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnul
 
 + (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;
+    using TypeInfo = OvenMode::Attributes::SupportedModes::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -38820,7 +39273,7 @@ + (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheCo
 
 - (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::CurrentMode::TypeInfo;
+    using TypeInfo = OvenMode::Attributes::CurrentMode::TypeInfo;
     [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
                                          clusterID:@(TypeInfo::GetClusterId())
                                        attributeID:@(TypeInfo::GetAttributeId())
@@ -38833,7 +39286,7 @@ - (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)p
                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
-    using TypeInfo = ModeSelect::Attributes::CurrentMode::TypeInfo;
+    using TypeInfo = OvenMode::Attributes::CurrentMode::TypeInfo;
     [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
                                                 clusterID:@(TypeInfo::GetClusterId())
                                               attributeID:@(TypeInfo::GetAttributeId())
@@ -38845,7 +39298,7 @@ - (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)p
 
 + (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;
+    using TypeInfo = OvenMode::Attributes::CurrentMode::TypeInfo;
     [clusterStateCacheContainer
         _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
                                       clusterID:TypeInfo::GetClusterId()
@@ -38856,7 +39309,534 @@ + (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheConta
 
 - (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    using TypeInfo = ModeSelect::Attributes::StartUpMode::TypeInfo;
+    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)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 = 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 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())
@@ -47228,6 +48208,1927 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC
 
 @end
 
+@implementation MTRBaseClusterBooleanSensorConfiguration
+
+- (void)suppressRequestWithParams:(MTRBooleanSensorConfigurationClusterSuppressRequestParams *)params 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
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)readAttributeSensitivityLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = BooleanSensorConfiguration::Attributes::SensitivityLevel::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (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 = BooleanSensorConfiguration::Attributes::SensitivityLevel::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeSensitivityLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = BooleanSensorConfiguration::Attributes::SensitivityLevel::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAlarmsActiveWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AlarmsActive::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAlarmsActiveWithParams:(MTRSubscribeParams * _Nonnull)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AlarmsActive::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAlarmsActiveWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AlarmsActive::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAlarmsSuppressedWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AlarmsSuppressed::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAlarmsSuppressedWithParams:(MTRSubscribeParams * _Nonnull)params
+                             subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                       reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AlarmsSuppressed::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAlarmsSuppressedWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AlarmsSuppressed::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAlarmsEnabledWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AlarmsEnabled::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeAlarmsEnabledWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion
+{
+    [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())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAlarmsEnabledWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = BooleanSensorConfiguration::Attributes::AlarmsEnabled::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 = BooleanSensorConfiguration::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 = BooleanSensorConfiguration::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 = BooleanSensorConfiguration::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 = BooleanSensorConfiguration::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 = BooleanSensorConfiguration::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 = BooleanSensorConfiguration::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 = BooleanSensorConfiguration::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 = BooleanSensorConfiguration::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 = BooleanSensorConfiguration::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 = BooleanSensorConfiguration::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 = BooleanSensorConfiguration::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 = BooleanSensorConfiguration::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 = BooleanSensorConfiguration::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 = BooleanSensorConfiguration::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 = BooleanSensorConfiguration::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 = BooleanSensorConfiguration::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 = BooleanSensorConfiguration::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 = BooleanSensorConfiguration::Attributes::ClusterRevision::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+@end
+
+@implementation MTRBaseClusterValveConfigurationAndControl
+
+- (void)openWithParams:(MTRValveConfigurationAndControlClusterOpenParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    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:responseHandler];
+}
+- (void)closeWithCompletion:(MTRStatusCompletion)completion
+{
+    [self closeWithParams:nil completion:completion];
+}
+- (void)closeWithParams:(MTRValveConfigurationAndControlClusterCloseParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRValveConfigurationAndControlClusterCloseParams
+            alloc] init];
+    }
+
+    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
+{
+    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)readAttributeOpenDurationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::OpenDuration::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeOpenDurationWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeOpenDurationWithValue:(NSNumber * _Nullable) value params:nil completion: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];
+    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 = ValveConfigurationAndControl::Attributes::OpenDuration::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)subscribeAttributeOpenDurationWithParams:(MTRSubscribeParams * _Nonnull)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::OpenDuration::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeOpenDurationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::OpenDuration::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeAutoCloseTimeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::AutoCloseTime::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeAutoCloseTimeWithParams:(MTRSubscribeParams * _Nonnull)params
+                          subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::AutoCloseTime::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeAutoCloseTimeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::AutoCloseTime::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeRemainingDurationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::RemainingDuration::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeRemainingDurationWithParams:(MTRSubscribeParams * _Nonnull)params
+                              subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                        reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::RemainingDuration::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeRemainingDurationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::RemainingDuration::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeCurrentStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::CurrentState::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeCurrentStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::CurrentState::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeCurrentStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::CurrentState::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeTargetStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::TargetState::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeTargetStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::TargetState::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeTargetStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::TargetState::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeStartUpStateWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::StartUpState::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeStartUpStateWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeStartUpStateWithValue:(NSNumber * _Nonnull) value params:nil completion:completion];
+}
+- (void)writeAttributeStartUpStateWithValue:(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 = 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)subscribeAttributeStartUpStateWithParams:(MTRSubscribeParams * _Nonnull)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::StartUpState::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeStartUpStateWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::StartUpState::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeCurrentLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::CurrentLevel::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeCurrentLevelWithParams:(MTRSubscribeParams * _Nonnull)params
+                         subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                   reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::CurrentLevel::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeCurrentLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::CurrentLevel::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeTargetLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::TargetLevel::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeTargetLevelWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::TargetLevel::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeTargetLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::TargetLevel::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeOpenLevelWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::OpenLevel::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeOpenLevelWithValue:(NSNumber * _Nullable)value completion:(MTRStatusCompletion)completion
+{
+    [self writeAttributeOpenLevelWithValue:(NSNumber * _Nullable) value params:nil completion:completion];
+}
+- (void)writeAttributeOpenLevelWithValue:(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 = 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)subscribeAttributeOpenLevelWithParams:(MTRSubscribeParams * _Nonnull)params
+                      subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::OpenLevel::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeOpenLevelWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::OpenLevel::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeValveFaultWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::ValveFault::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeValveFaultWithParams:(MTRSubscribeParams * _Nonnull)params
+                       subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::ValveFault::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeValveFaultWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = ValveConfigurationAndControl::Attributes::ValveFault::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 = ValveConfigurationAndControl::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 = ValveConfigurationAndControl::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 = ValveConfigurationAndControl::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 = ValveConfigurationAndControl::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 = ValveConfigurationAndControl::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 = ValveConfigurationAndControl::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 = ValveConfigurationAndControl::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 = ValveConfigurationAndControl::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 = ValveConfigurationAndControl::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 = ValveConfigurationAndControl::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 = ValveConfigurationAndControl::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 = ValveConfigurationAndControl::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 = ValveConfigurationAndControl::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 = ValveConfigurationAndControl::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 = ValveConfigurationAndControl::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 = ValveConfigurationAndControl::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 = ValveConfigurationAndControl::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 = ValveConfigurationAndControl::Attributes::ClusterRevision::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+@end
+
+@implementation MTRBaseClusterDemandResponseLoadControl
+
+- (void)registerLoadControlProgramRequestWithParams:(MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams *)params completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams
+            alloc] init];
+    }
+
+    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)unregisterLoadControlProgramRequestWithParams:(MTRDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestParams *)params completion:(MTRStatusCompletion)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
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+- (void)addLoadControlEventRequestWithParams:(MTRDemandResponseLoadControlClusterAddLoadControlEventRequestParams *)params completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRDemandResponseLoadControlClusterAddLoadControlEventRequestParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    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:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+- (void)removeLoadControlEventRequestWithParams:(MTRDemandResponseLoadControlClusterRemoveLoadControlEventRequestParams *)params completion:(MTRStatusCompletion)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
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+- (void)clearLoadControlEventsRequestWithCompletion:(MTRStatusCompletion)completion
+{
+    [self clearLoadControlEventsRequestWithParams:nil completion:completion];
+}
+- (void)clearLoadControlEventsRequestWithParams:(MTRDemandResponseLoadControlClusterClearLoadControlEventsRequestParams * _Nullable)params completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRDemandResponseLoadControlClusterClearLoadControlEventsRequestParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
+
+    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:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)readAttributeDeviceClassWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::DeviceClass::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeDeviceClassWithParams:(MTRSubscribeParams * _Nonnull)params
+                        subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                  reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::DeviceClass::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeDeviceClassWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::DeviceClass::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeLoadControlProgramsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::LoadControlPrograms::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeLoadControlProgramsWithParams:(MTRSubscribeParams * _Nonnull)params
+                                subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                          reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::LoadControlPrograms::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeLoadControlProgramsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::LoadControlPrograms::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeNumberOfLoadControlProgramsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfLoadControlPrograms::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (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 (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::ActiveEvents::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeActiveEventsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::ActiveEvents::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeNumberOfEventsPerProgramWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfEventsPerProgram::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeNumberOfEventsPerProgramWithParams:(MTRSubscribeParams * _Nonnull)params
+                                     subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfEventsPerProgram::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeNumberOfEventsPerProgramWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfEventsPerProgram::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeNumberOfTransistionsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfTransistions::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)subscribeAttributeNumberOfTransistionsWithParams:(MTRSubscribeParams * _Nonnull)params
+                                 subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished
+                                           reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfTransistions::TypeInfo;
+    [self.device _subscribeToKnownAttributeWithEndpointID:@(self.endpoint)
+                                                clusterID:@(TypeInfo::GetClusterId())
+                                              attributeID:@(TypeInfo::GetAttributeId())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeNumberOfTransistionsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::NumberOfTransistions::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeDefaultRandomStartWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::DefaultRandomStart::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeDefaultRandomStartWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion
+{
+    [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())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeDefaultRandomStartWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::DefaultRandomStart::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+- (void)readAttributeDefaultRandomDurationWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::DefaultRandomDuration::TypeInfo;
+    [self.device _readKnownAttributeWithEndpointID:@(self.endpoint)
+                                         clusterID:@(TypeInfo::GetClusterId())
+                                       attributeID:@(TypeInfo::GetAttributeId())
+                                            params:nil
+                                             queue:self.callbackQueue
+                                        completion:completion];
+}
+
+- (void)writeAttributeDefaultRandomDurationWithValue:(NSNumber * _Nonnull)value completion:(MTRStatusCompletion)completion
+{
+    [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())
+                                                   params:params
+                                                    queue:self.callbackQueue
+                                            reportHandler:reportHandler
+                                  subscriptionEstablished:subscriptionEstablished];
+}
+
++ (void)readAttributeDefaultRandomDurationWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
+{
+    using TypeInfo = DemandResponseLoadControl::Attributes::DefaultRandomDuration::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 = DemandResponseLoadControl::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 = DemandResponseLoadControl::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 = DemandResponseLoadControl::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 = DemandResponseLoadControl::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 = DemandResponseLoadControl::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 = DemandResponseLoadControl::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 = DemandResponseLoadControl::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 = DemandResponseLoadControl::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 = DemandResponseLoadControl::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 = DemandResponseLoadControl::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 = DemandResponseLoadControl::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 = DemandResponseLoadControl::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 = DemandResponseLoadControl::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 = DemandResponseLoadControl::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 = DemandResponseLoadControl::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 = DemandResponseLoadControl::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 = DemandResponseLoadControl::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 = DemandResponseLoadControl::Attributes::ClusterRevision::TypeInfo;
+    [clusterStateCacheContainer
+        _readKnownCachedAttributeWithEndpointID:static_cast<chip::EndpointId>([endpoint unsignedShortValue])
+                                      clusterID:TypeInfo::GetClusterId()
+                                    attributeID:TypeInfo::GetAttributeId()
+                                          queue:queue
+                                     completion:completion];
+}
+
+@end
+
 @implementation MTRBaseClusterDoorLock
 
 - (void)lockDoorWithParams:(MTRDoorLockClusterLockDoorParams * _Nullable)params completion:(MTRStatusCompletion)completion
@@ -63791,7 +66692,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); });
@@ -63855,7 +66756,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); });
@@ -63919,7 +66820,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); });
@@ -83064,6 +85965,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;
@@ -87806,7 +90743,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); });
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
index 66d0884704bfaa..d529d5a004bb16 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
@@ -126,6 +126,8 @@ 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,
+    MTRClusterIDTypeOvenModeID MTR_PROVISIONALLY_AVAILABLE = 0x00000049,
     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,
@@ -144,6 +146,9 @@ typedef NS_ENUM(uint32_t, MTRClusterIDType) {
     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,
     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,
@@ -319,7 +324,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_NEWLY_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,
@@ -827,6 +832,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,
@@ -2250,6 +2257,29 @@ 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 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 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))
@@ -2515,6 +2545,53 @@ 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
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeDeviceClassID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeLoadControlProgramsID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfLoadControlProgramsID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeEventsID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeActiveEventsID MTR_PROVISIONALLY_AVAILABLE = 0x00000004,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfEventsPerProgramID MTR_PROVISIONALLY_AVAILABLE = 0x00000005,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfTransistionsID MTR_PROVISIONALLY_AVAILABLE = 0x00000006,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeDefaultRandomStartID MTR_PROVISIONALLY_AVAILABLE = 0x00000007,
+    MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeDefaultRandomDurationID MTR_PROVISIONALLY_AVAILABLE = 0x00000008,
+    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 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))
@@ -4135,6 +4212,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,
@@ -5796,6 +5874,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
@@ -5967,6 +6047,16 @@ typedef NS_ENUM(uint32_t, MTRCommandIDType) {
     MTRCommandIDTypeClusterICDManagementCommandUnregisterClientID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
     MTRCommandIDTypeClusterICDManagementCommandStayActiveRequestID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
 
+    // Cluster Timer commands
+    MTRCommandIDTypeClusterTimerCommandSetTimerID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRCommandIDTypeClusterTimerCommandResetTimerID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+    MTRCommandIDTypeClusterTimerCommandAddTimeID MTR_PROVISIONALLY_AVAILABLE = 0x00000002,
+    MTRCommandIDTypeClusterTimerCommandReduceTimeID MTR_PROVISIONALLY_AVAILABLE = 0x00000003,
+
+    // Cluster OvenMode commands
+    MTRCommandIDTypeClusterOvenModeCommandChangeToModeID MTR_PROVISIONALLY_AVAILABLE = 0x00000000,
+    MTRCommandIDTypeClusterOvenModeCommandChangeToModeResponseID MTR_PROVISIONALLY_AVAILABLE = 0x00000001,
+
     // Cluster ModeSelect deprecated command id names
     MTRClusterModeSelectCommandChangeToModeID
         MTR_DEPRECATED("Please use MTRCommandIDTypeClusterModeSelectCommandChangeToModeID", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4))
@@ -6029,6 +6119,21 @@ 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 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))
@@ -6865,6 +6970,17 @@ 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 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 9b58b2c32f3376..9453309717e85d 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
@@ -147,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_NEWLY_AVAILABLE;
 
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -728,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));
@@ -1187,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));
 
@@ -2194,6 +2199,105 @@ MTR_PROVISIONALLY_AVAILABLE
 
 @end
 
+/**
+ * Cluster Timer
+ *    This cluster supports creating a simple timer functionality.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterTimer : MTRGenericCluster
+
+- (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)readAttributeSetTimeWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeTimeRemainingWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeTimerStateWithParams:(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 MTRClusterTimer (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 Oven Mode
+ *    Attributes and commands for selecting a mode from a list of supported options.
+ */
+MTR_PROVISIONALLY_AVAILABLE
+@interface MTRClusterOvenMode : MTRGenericCluster
+
+- (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;
+
+- (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 MTRClusterOvenMode (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 Mode Select
  *    Attributes and commands for selecting a mode from a list of supported options.
@@ -3102,6 +3206,190 @@ 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)readAttributeCurrentStateWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeTargetStateWithParams:(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)readAttributeCurrentLevelWithParams:(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;
+
+- (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 MTRClusterValveConfigurationAndControl (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 Demand Response Load Control
+ *    This cluster provides an interface to the functionality of Smart Energy Demand Response and Load Control.
+ */
+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)readAttributeDeviceClassWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeLoadControlProgramsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfLoadControlProgramsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveEventsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfEventsPerProgramWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE;
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfTransistionsWithParams:(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;
+
+- (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 MTRClusterDemandResponseLoadControl (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 Door Lock
  *    An interface to a generic way to secure a door
@@ -5013,6 +5301,8 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
 
 - (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));
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
index bf69082cf83584..8e7f7470c68b23 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
@@ -736,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
@@ -2760,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];
@@ -3889,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];
@@ -6545,6 +6582,270 @@ - (void)stayActiveRequestWithParams:(MTRICDManagementClusterStayActiveRequestPar
 
 @end
 
+@implementation MTRClusterTimer
+
+- (void)setTimerWithParams:(MTRTimerClusterSetTimerParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRTimerClusterSetTimerParams
+            alloc] init];
+    }
+
+    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 = [[MTRTimerClusterResetTimerParams
+            alloc] init];
+    }
+
+    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
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)addTimeWithParams:(MTRTimerClusterAddTimeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRTimerClusterAddTimeParams
+            alloc] init];
+    }
+
+    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
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (void)reduceTimeWithParams:(MTRTimerClusterReduceTimeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+{
+    if (params == nil) {
+        params = [[MTRTimerClusterReduceTimeParams
+            alloc] init];
+    }
+
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
+
+    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)readAttributeSetTimeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTimerID) attributeID:@(MTRAttributeIDTypeClusterTimerAttributeSetTimeID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeTimeRemainingWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTimerID) attributeID:@(MTRAttributeIDTypeClusterTimerAttributeTimeRemainingID) params:params];
+}
+
+- (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:@(MTRClusterIDTypeTimerID) attributeID:@(MTRAttributeIDTypeClusterTimerAttributeGeneratedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)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:@(MTRClusterIDTypeTimerID) attributeID:@(MTRAttributeIDTypeClusterTimerAttributeEventListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)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:@(MTRClusterIDTypeTimerID) attributeID:@(MTRAttributeIDTypeClusterTimerAttributeFeatureMapID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeTimerID) attributeID:@(MTRAttributeIDTypeClusterTimerAttributeClusterRevisionID) params:params];
+}
+
+@end
+
+@implementation MTRClusterOvenMode
+
+- (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 = [[MTROvenModeClusterChangeToModeParams
+            alloc] init];
+    }
+
+    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
+                                    expectedValues:expectedValues
+                             expectedValueInterval:expectedValueIntervalMs
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:MTROvenModeClusterChangeToModeResponseParams.class
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)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:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeCurrentModeID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeStartUpModeID) 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:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeStartUpModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeOnModeID) 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:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeOnModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)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:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeAcceptedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventListWithParams:(MTRReadParams * _Nullable)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:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeAttributeListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)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:@(MTRClusterIDTypeOvenModeID) attributeID:@(MTRAttributeIDTypeClusterOvenModeAttributeClusterRevisionID) params:params];
+}
+
+@end
+
 @implementation MTRClusterModeSelect
 
 - (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
@@ -8037,24 +8338,492 @@ - (void)pauseWithParams:(MTRRVCOperationalStateClusterPauseParams * _Nullable)pa
                                         completion:responseHandler];
 }
 
-- (void)stopWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(void (^)(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable data, NSError * _Nullable error))completion
+- (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
+                                timedInvokeTimeout:timedInvokeTimeoutMs
+                       serverSideProcessingTimeout:params.serverSideProcessingTimeout
+                                     responseClass:nil
+                                             queue:self.callbackQueue
+                                        completion:responseHandler];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeSensitivityLevelWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBooleanSensorConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeSensitivityLevelID) params:params];
+}
+
+- (void)writeAttributeSensitivityLevelWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+{
+    [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)readAttributeAlarmsActiveWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBooleanSensorConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeAlarmsActiveID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAlarmsSuppressedWithParams:(MTRReadParams * _Nullable)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:@(MTRClusterIDTypeBooleanSensorConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeGeneratedCommandListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)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:@(MTRClusterIDTypeBooleanSensorConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeEventListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBooleanSensorConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeAttributeListID) params:params];
+}
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
 {
-    [self stopWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBooleanSensorConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeFeatureMapID) params:params];
 }
-- (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
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeBooleanSensorConfigurationID) attributeID:@(MTRAttributeIDTypeClusterBooleanSensorConfigurationAttributeClusterRevisionID) params:params];
+}
+
+@end
+
+@implementation MTRClusterValveConfigurationAndControl
+
+- (void)openWithParams:(MTRValveConfigurationAndControlClusterOpenParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRRVCOperationalStateClusterStopParams
+        params = [[MTRValveConfigurationAndControlClusterOpenParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = RvcOperationalState::Commands::Stop::Type;
+    using RequestType = ValveConfigurationAndControl::Commands::Open::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -8063,29 +8832,29 @@ - (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
+- (void)closeWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
-    [self startWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+    [self closeWithParams: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)closeWithParams:(MTRValveConfigurationAndControlClusterCloseParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRRVCOperationalStateClusterStartParams
+        params = [[MTRValveConfigurationAndControlClusterCloseParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = RvcOperationalState::Commands::Start::Type;
+    using RequestType = ValveConfigurationAndControl::Commands::Close::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -8094,29 +8863,25 @@ - (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
-{
-    [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
+- (void)setLevelWithParams:(MTRValveConfigurationAndControlClusterSetLevelParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRRVCOperationalStateClusterResumeParams
+        params = [[MTRValveConfigurationAndControlClusterSetLevelParams
             alloc] init];
     }
 
     auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
-        completion(response, error);
+        completion(error);
     };
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = RvcOperationalState::Commands::Resume::Type;
+    using RequestType = ValveConfigurationAndControl::Commands::SetLevel::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -8125,83 +8890,132 @@ - (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
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeOpenDurationWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributePhaseListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeOpenDurationID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentPhaseWithParams:(MTRReadParams * _Nullable)params
+- (void)writeAttributeOpenDurationWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeCurrentPhaseID) params:params];
+    [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)readAttributeCountdownTimeWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeAutoCloseTimeWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeCountdownTimeID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeAutoCloseTimeID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalStateListWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeRemainingDurationWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeOperationalStateListID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeRemainingDurationID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalStateWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeCurrentStateWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeOperationalStateID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeCurrentStateID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeOperationalErrorWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeTargetStateWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeOperationalErrorID) params: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:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeGeneratedCommandListID) params: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:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeAcceptedCommandListID) params: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:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeEventListID) params: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:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeAttributeListID) params: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:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeFeatureMapID) params: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:@(MTRClusterIDTypeRVCOperationalStateID) attributeID:@(MTRAttributeIDTypeClusterRVCOperationalStateAttributeClusterRevisionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeValveConfigurationAndControlID) attributeID:@(MTRAttributeIDTypeClusterValveConfigurationAndControlAttributeClusterRevisionID) params:params];
 }
 
 @end
 
-@implementation MTRClusterHEPAFilterMonitoring
+@implementation MTRClusterDemandResponseLoadControl
 
-- (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
+- (void)registerLoadControlProgramRequestWithParams:(MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRHEPAFilterMonitoringClusterResetConditionParams
+        params = [[MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams
             alloc] init];
     }
 
@@ -8211,7 +9025,7 @@ - (void)resetConditionWithParams:(MTRHEPAFilterMonitoringClusterResetConditionPa
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = HepaFilterMonitoring::Commands::ResetCondition::Type;
+    using RequestType = DemandResponseLoadControl::Commands::RegisterLoadControlProgramRequest::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -8225,89 +9039,95 @@ - (void)resetConditionWithParams:(MTRHEPAFilterMonitoringClusterResetConditionPa
                                         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
+- (void)unregisterLoadControlProgramRequestWithParams:(MTRDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeDegradationDirectionID) params:params];
-}
+    if (params == nil) {
+        params = [[MTRDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestParams
+            alloc] init];
+    }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeChangeIndicationWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeChangeIndicationID) params:params];
-}
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeInPlaceIndicatorWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeInPlaceIndicatorID) params:params];
-}
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeLastChangedTimeWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeLastChangedTimeID) params:params];
+    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)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
+- (void)addLoadControlEventRequestWithParams:(MTRDemandResponseLoadControlClusterAddLoadControlEventRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
-    NSNumber * timedWriteTimeout = params.timedWriteTimeout;
-
-    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeLastChangedTimeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
-}
+    if (params == nil) {
+        params = [[MTRDemandResponseLoadControlClusterAddLoadControlEventRequestParams
+            alloc] init];
+    }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeReplacementProductListWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeReplacementProductListID) params:params];
-}
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeGeneratedCommandListID) params:params];
-}
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeAcceptedCommandListID) params:params];
+    using RequestType = DemandResponseLoadControl::Commands::AddLoadControlEventRequest::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)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params
+- (void)removeLoadControlEventRequestWithParams:(MTRDemandResponseLoadControlClusterRemoveLoadControlEventRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeEventListID) params:params];
-}
+    if (params == nil) {
+        params = [[MTRDemandResponseLoadControlClusterRemoveLoadControlEventRequestParams
+            alloc] init];
+    }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeAttributeListID) params:params];
-}
+    auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) {
+        completion(error);
+    };
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeFeatureMapID) params:params];
-}
+    auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params
-{
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeHEPAFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterHEPAFilterMonitoringAttributeClusterRevisionID) params:params];
+    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];
 }
 
-@end
-
-@implementation MTRClusterActivatedCarbonFilterMonitoring
-
-- (void)resetConditionWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
+- (void)clearLoadControlEventsRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
-    [self resetConditionWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion];
+    [self clearLoadControlEventsRequestWithParams: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
+- (void)clearLoadControlEventsRequestWithParams:(MTRDemandResponseLoadControlClusterClearLoadControlEventsRequestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion
 {
     if (params == nil) {
-        params = [[MTRActivatedCarbonFilterMonitoringClusterResetConditionParams
+        params = [[MTRDemandResponseLoadControlClusterClearLoadControlEventsRequestParams
             alloc] init];
     }
 
@@ -8317,7 +9137,7 @@ - (void)resetConditionWithParams:(MTRActivatedCarbonFilterMonitoringClusterReset
 
     auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs;
 
-    using RequestType = ActivatedCarbonFilterMonitoring::Commands::ResetCondition::Type;
+    using RequestType = DemandResponseLoadControl::Commands::ClearLoadControlEventsRequest::Type;
     [self.device _invokeKnownCommandWithEndpointID:@(self.endpoint)
                                          clusterID:@(RequestType::GetClusterId())
                                          commandID:@(RequestType::GetCommandId())
@@ -8331,75 +9151,101 @@ - (void)resetConditionWithParams:(MTRActivatedCarbonFilterMonitoringClusterReset
                                         completion:responseHandler];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeConditionWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeDeviceClassWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeConditionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeDeviceClassID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeDegradationDirectionWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeLoadControlProgramsWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeDegradationDirectionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeLoadControlProgramsID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeChangeIndicationWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfLoadControlProgramsWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeChangeIndicationID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfLoadControlProgramsID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeInPlaceIndicatorWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeEventsWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeInPlaceIndicatorID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeEventsID) params:params];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeLastChangedTimeWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeActiveEventsWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeLastChangedTimeID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeActiveEventsID) params:params];
 }
 
-- (void)writeAttributeLastChangedTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfEventsPerProgramWithParams:(MTRReadParams * _Nullable)params
 {
-    [self writeAttributeLastChangedTimeWithValue:dataValueDictionary expectedValueInterval:expectedValueIntervalMs params:nil];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfEventsPerProgramID) params:params];
 }
-- (void)writeAttributeLastChangedTimeWithValue:(NSDictionary<NSString *, id> *)dataValueDictionary expectedValueInterval:(NSNumber *)expectedValueIntervalMs params:(MTRWriteParams * _Nullable)params
+
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeNumberOfTransistionsWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeNumberOfTransistionsID) 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:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeLastChangedTimeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
+    [self.device writeAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeDefaultRandomStartID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout];
 }
 
-- (NSDictionary<NSString *, id> * _Nullable)readAttributeReplacementProductListWithParams:(MTRReadParams * _Nullable)params
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeDefaultRandomDurationWithParams:(MTRReadParams * _Nullable)params
 {
-    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeReplacementProductListID) params: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:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeGeneratedCommandListID) 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:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeAcceptedCommandListID) 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:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeEventListID) 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:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeAttributeListID) 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:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeFeatureMapID) 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:@(MTRClusterIDTypeActivatedCarbonFilterMonitoringID) attributeID:@(MTRAttributeIDTypeClusterActivatedCarbonFilterMonitoringAttributeClusterRevisionID) params:params];
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeDemandResponseLoadControlID) attributeID:@(MTRAttributeIDTypeClusterDemandResponseLoadControlAttributeClusterRevisionID) params:params];
 }
 
 @end
@@ -14106,6 +14952,11 @@ @implementation MTRClusterWakeOnLAN
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeWakeOnLANID) attributeID:@(MTRAttributeIDTypeClusterWakeOnLANAttributeMACAddressID) params:params];
 }
 
+- (NSDictionary<NSString *, id> * _Nullable)readAttributeLinkLocalAddressWithParams:(MTRReadParams * _Nullable)params
+{
+    return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeWakeOnLANID) attributeID:@(MTRAttributeIDTypeClusterWakeOnLANAttributeLinkLocalAddressID) params:params];
+}
+
 - (NSDictionary<NSString *, id> * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params
 {
     return [self.device readAttributeWithEndpointID:@(self.endpoint) clusterID:@(MTRClusterIDTypeWakeOnLANID) attributeID:@(MTRAttributeIDTypeClusterWakeOnLANAttributeGeneratedCommandListID) params:params];
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
index 9e6b0e19d006a4..c6f825ba4d4025 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>
 
@@ -4426,6 +4489,175 @@ MTR_PROVISIONALLY_AVAILABLE
 @property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout;
 @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).
+ *
+ * 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 MTRTimerClusterResetTimerParams : 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 MTRTimerClusterAddTimeParams : NSObject <NSCopying>
+
+@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;
+
+/**
+ * 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 MTRTimerClusterReduceTimeParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nonnull timeReduction 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 MTROvenModeClusterChangeToModeParams : 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 MTROvenModeClusterChangeToModeResponseParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nonnull status MTR_PROVISIONALLY_AVAILABLE;
+
+@property (nonatomic, copy) NSString * _Nullable statusText MTR_PROVISIONALLY_AVAILABLE;
+
+/**
+ * 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
+ * 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 MTRModeSelectClusterChangeToModeParams : NSObject <NSCopying>
 
@@ -5213,6 +5445,276 @@ MTR_PROVISIONALLY_AVAILABLE
 @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).
+ *
+ * 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 MTRValveConfigurationAndControlClusterOpenParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) NSNumber * _Nullable openDuration 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 MTRValveConfigurationAndControlClusterCloseParams : 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 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).
+ *
+ * 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 MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams : NSObject <NSCopying>
+
+@property (nonatomic, copy) MTRDemandResponseLoadControlClusterLoadControlProgramStruct * _Nonnull loadControlProgram 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 MTRDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestParams : NSObject <NSCopying>
+
+@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;
+
+/**
+ * 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_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @interface MTRDoorLockClusterLockDoorParams : NSObject <NSCopying>
 
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
index 8828803e61d273..e3ae4e39934d9b 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
 {
@@ -11841,12 +12065,12 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRModeSelectClusterChangeToModeParams
+@implementation MTRTimerClusterSetTimerParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _newMode = @(0);
+        _newTime = @(0);
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -11855,9 +12079,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;
 
@@ -11866,20 +12090,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);
@@ -11920,12 +12144,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;
     }
@@ -11934,9 +12156,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;
 
@@ -11945,21 +12166,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()) {
@@ -11999,100 +12217,165 @@ - (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
+@end
+
+@implementation MTRTimerClusterAddTimeParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    if (!(self = [super init])) {
-        return nil;
+    chip::app::Clusters::Timer::Commands::AddTime::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        encodableStruct.additionalTime = self.additionalTime.unsignedIntValue;
     }
 
-    using DecodableType = chip::app::Clusters::LaundryWasherMode::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 MTRLaundryWasherModeClusterChangeToModeResponseParams (InternalMethods)
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
 
-- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::LaundryWasherMode::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 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 MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams
+@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 MTROvenModeClusterChangeToModeParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -12106,7 +12389,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams alloc] init];
+    auto other = [[MTROvenModeClusterChangeToModeParams alloc] init];
 
     other.newMode = self.newMode;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
@@ -12123,11 +12406,11 @@ - (NSString *)description
 
 @end
 
-@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams (InternalMethods)
+@implementation MTROvenModeClusterChangeToModeParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Type encodableStruct;
+    chip::app::Clusters::OvenMode::Commands::ChangeToMode::Type encodableStruct;
     ListFreer listFreer;
     {
         encodableStruct.newMode = self.newMode.unsignedCharValue;
@@ -12171,7 +12454,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams
+@implementation MTROvenModeClusterChangeToModeResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -12185,7 +12468,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams alloc] init];
+    auto other = [[MTROvenModeClusterChangeToModeResponseParams alloc] init];
 
     other.status = self.status;
     other.statusText = self.statusText;
@@ -12206,7 +12489,7 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)r
         return nil;
     }
 
-    using DecodableType = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::DecodableType;
+    using DecodableType = chip::app::Clusters::OvenMode::Commands::ChangeToModeResponse::DecodableType;
     chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
                                                                            clusterID:DecodableType::GetClusterId()
                                                                            commandID:DecodableType::GetCommandId()
@@ -12241,9 +12524,9 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)r
 
 @end
 
-@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams (InternalMethods)
+@implementation MTROvenModeClusterChangeToModeResponseParams (InternalMethods)
 
-- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::OvenMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct
 {
     {
         self.status = [NSNumber numberWithUnsignedChar:decodableStruct.status];
@@ -12264,7 +12547,7 @@ - (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::Refriger
 
 @end
 
-@implementation MTRRVCRunModeClusterChangeToModeParams
+@implementation MTRModeSelectClusterChangeToModeParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -12278,7 +12561,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRVCRunModeClusterChangeToModeParams alloc] init];
+    auto other = [[MTRModeSelectClusterChangeToModeParams alloc] init];
 
     other.newMode = self.newMode;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
@@ -12295,11 +12578,11 @@ - (NSString *)description
 
 @end
 
-@implementation MTRRVCRunModeClusterChangeToModeParams (InternalMethods)
+@implementation MTRModeSelectClusterChangeToModeParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::RvcRunMode::Commands::ChangeToMode::Type encodableStruct;
+    chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Type encodableStruct;
     ListFreer listFreer;
     {
         encodableStruct.newMode = self.newMode.unsignedCharValue;
@@ -12343,7 +12626,86 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRRVCRunModeClusterChangeToModeResponseParams
+@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]) {
@@ -12357,7 +12719,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRVCRunModeClusterChangeToModeResponseParams alloc] init];
+    auto other = [[MTRLaundryWasherModeClusterChangeToModeResponseParams alloc] init];
 
     other.status = self.status;
     other.statusText = self.statusText;
@@ -12378,7 +12740,7 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)r
         return nil;
     }
 
-    using DecodableType = chip::app::Clusters::RvcRunMode::Commands::ChangeToModeResponse::DecodableType;
+    using DecodableType = chip::app::Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType;
     chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
                                                                            clusterID:DecodableType::GetClusterId()
                                                                            commandID:DecodableType::GetCommandId()
@@ -12413,9 +12775,9 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)r
 
 @end
 
-@implementation MTRRVCRunModeClusterChangeToModeResponseParams (InternalMethods)
+@implementation MTRLaundryWasherModeClusterChangeToModeResponseParams (InternalMethods)
 
-- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RvcRunMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct
 {
     {
         self.status = [NSNumber numberWithUnsignedChar:decodableStruct.status];
@@ -12436,7 +12798,7 @@ - (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RvcRunMo
 
 @end
 
-@implementation MTRRVCCleanModeClusterChangeToModeParams
+@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -12450,7 +12812,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRVCCleanModeClusterChangeToModeParams alloc] init];
+    auto other = [[MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams alloc] init];
 
     other.newMode = self.newMode;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
@@ -12467,11 +12829,11 @@ - (NSString *)description
 
 @end
 
-@implementation MTRRVCCleanModeClusterChangeToModeParams (InternalMethods)
+@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::RvcCleanMode::Commands::ChangeToMode::Type encodableStruct;
+    chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Type encodableStruct;
     ListFreer listFreer;
     {
         encodableStruct.newMode = self.newMode.unsignedCharValue;
@@ -12515,7 +12877,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRRVCCleanModeClusterChangeToModeResponseParams
+@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -12529,7 +12891,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRVCCleanModeClusterChangeToModeResponseParams alloc] init];
+    auto other = [[MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams alloc] init];
 
     other.status = self.status;
     other.statusText = self.statusText;
@@ -12550,7 +12912,7 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)r
         return nil;
     }
 
-    using DecodableType = chip::app::Clusters::RvcCleanMode::Commands::ChangeToModeResponse::DecodableType;
+    using DecodableType = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::DecodableType;
     chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
                                                                            clusterID:DecodableType::GetClusterId()
                                                                            commandID:DecodableType::GetCommandId()
@@ -12585,9 +12947,9 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)r
 
 @end
 
-@implementation MTRRVCCleanModeClusterChangeToModeResponseParams (InternalMethods)
+@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams (InternalMethods)
 
-- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RvcCleanMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct
 {
     {
         self.status = [NSNumber numberWithUnsignedChar:decodableStruct.status];
@@ -12608,14 +12970,12 @@ - (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RvcClean
 
 @end
 
-@implementation MTRTemperatureControlClusterSetTemperatureParams
+@implementation MTRRVCRunModeClusterChangeToModeParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _targetTemperature = nil;
-
-        _targetTemperatureLevel = nil;
+        _newMode = @(0);
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -12624,10 +12984,9 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRTemperatureControlClusterSetTemperatureParams alloc] init];
+    auto other = [[MTRRVCRunModeClusterChangeToModeParams alloc] init];
 
-    other.targetTemperature = self.targetTemperature;
-    other.targetTemperatureLevel = self.targetTemperatureLevel;
+    other.newMode = self.newMode;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -12636,29 +12995,20 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: targetTemperature:%@; targetTemperatureLevel:%@; >", NSStringFromClass([self class]), _targetTemperature, _targetTemperatureLevel];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newMode:%@; >", NSStringFromClass([self class]), _newMode];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRTemperatureControlClusterSetTemperatureParams (InternalMethods)
+@implementation MTRRVCRunModeClusterChangeToModeParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::TemperatureControl::Commands::SetTemperature::Type encodableStruct;
+    chip::app::Clusters::RvcRunMode::Commands::ChangeToMode::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;
-        }
+        encodableStruct.newMode = self.newMode.unsignedCharValue;
     }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
@@ -12699,21 +13049,114 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRDishwasherModeClusterChangeToModeParams
+@implementation MTRRVCRunModeClusterChangeToModeResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _newMode = @(0);
-        _timedInvokeTimeoutMs = nil;
-        _serverSideProcessingTimeout = nil;
+        _status = @(0);
+
+        _statusText = nil;
     }
     return self;
 }
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRDishwasherModeClusterChangeToModeParams alloc] init];
+    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;
@@ -12730,11 +13173,11 @@ - (NSString *)description
 
 @end
 
-@implementation MTRDishwasherModeClusterChangeToModeParams (InternalMethods)
+@implementation MTRRVCCleanModeClusterChangeToModeParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::DishwasherMode::Commands::ChangeToMode::Type encodableStruct;
+    chip::app::Clusters::RvcCleanMode::Commands::ChangeToMode::Type encodableStruct;
     ListFreer listFreer;
     {
         encodableStruct.newMode = self.newMode.unsignedCharValue;
@@ -12778,7 +13221,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRDishwasherModeClusterChangeToModeResponseParams
+@implementation MTRRVCCleanModeClusterChangeToModeResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -12792,7 +13235,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRDishwasherModeClusterChangeToModeResponseParams alloc] init];
+    auto other = [[MTRRVCCleanModeClusterChangeToModeResponseParams alloc] init];
 
     other.status = self.status;
     other.statusText = self.statusText;
@@ -12813,7 +13256,7 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)r
         return nil;
     }
 
-    using DecodableType = chip::app::Clusters::DishwasherMode::Commands::ChangeToModeResponse::DecodableType;
+    using DecodableType = chip::app::Clusters::RvcCleanMode::Commands::ChangeToModeResponse::DecodableType;
     chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue
                                                                            clusterID:DecodableType::GetClusterId()
                                                                            commandID:DecodableType::GetCommandId()
@@ -12848,9 +13291,9 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)r
 
 @end
 
-@implementation MTRDishwasherModeClusterChangeToModeResponseParams (InternalMethods)
+@implementation MTRRVCCleanModeClusterChangeToModeResponseParams (InternalMethods)
 
-- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::DishwasherMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RvcCleanMode::Commands::ChangeToModeResponse::DecodableType &)decodableStruct
 {
     {
         self.status = [NSNumber numberWithUnsignedChar:decodableStruct.status];
@@ -12871,10 +13314,14 @@ - (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::Dishwash
 
 @end
 
-@implementation MTRSmokeCOAlarmClusterSelfTestRequestParams
+@implementation MTRTemperatureControlClusterSetTemperatureParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _targetTemperature = nil;
+
+        _targetTemperatureLevel = nil;
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -12883,8 +13330,10 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRSmokeCOAlarmClusterSelfTestRequestParams alloc] init];
+    auto other = [[MTRTemperatureControlClusterSetTemperatureParams alloc] init];
 
+    other.targetTemperature = self.targetTemperature;
+    other.targetTemperatureLevel = self.targetTemperatureLevel;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -12893,18 +13342,30 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: targetTemperature:%@; targetTemperatureLevel:%@; >", NSStringFromClass([self class]), _targetTemperature, _targetTemperatureLevel];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRSmokeCOAlarmClusterSelfTestRequestParams (InternalMethods)
+@implementation MTRTemperatureControlClusterSetTemperatureParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::SmokeCoAlarm::Commands::SelfTestRequest::Type encodableStruct;
+    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()) {
@@ -12944,12 +13405,12 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRDishwasherAlarmClusterResetParams
+@implementation MTRDishwasherModeClusterChangeToModeParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _alarms = @(0);
+        _newMode = @(0);
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -12958,9 +13419,9 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRDishwasherAlarmClusterResetParams alloc] init];
+    auto other = [[MTRDishwasherModeClusterChangeToModeParams alloc] init];
 
-    other.alarms = self.alarms;
+    other.newMode = self.newMode;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -12969,20 +13430,20 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: alarms:%@; >", NSStringFromClass([self class]), _alarms];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: newMode:%@; >", NSStringFromClass([self class]), _newMode];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRDishwasherAlarmClusterResetParams (InternalMethods)
+@implementation MTRDishwasherModeClusterChangeToModeParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::DishwasherAlarm::Commands::Reset::Type encodableStruct;
+    chip::app::Clusters::DishwasherMode::Commands::ChangeToMode::Type encodableStruct;
     ListFreer listFreer;
     {
-        encodableStruct.alarms = static_cast<std::remove_reference_t<decltype(encodableStruct.alarms)>>(self.alarms.unsignedIntValue);
+        encodableStruct.newMode = self.newMode.unsignedCharValue;
     }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
@@ -13023,12 +13484,103 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRDishwasherAlarmClusterModifyEnabledAlarmsParams
+@implementation MTRDishwasherModeClusterChangeToModeResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _mask = @(0);
+        _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;
     }
@@ -13037,9 +13589,8 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRDishwasherAlarmClusterModifyEnabledAlarmsParams alloc] init];
+    auto other = [[MTRSmokeCOAlarmClusterSelfTestRequestParams alloc] init];
 
-    other.mask = self.mask;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -13048,21 +13599,818 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: mask:%@; >", NSStringFromClass([self class]), _mask];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRDishwasherAlarmClusterModifyEnabledAlarmsParams (InternalMethods)
+@implementation MTRSmokeCOAlarmClusterSelfTestRequestParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::DishwasherAlarm::Commands::ModifyEnabledAlarms::Type encodableStruct;
+    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()
+                                                                               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 MTROperationalStateClusterOperationalCommandResponseParams (InternalMethods)
+
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::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;
+            }
+        } 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 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;
-    {
-        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()) {
@@ -13102,16 +14450,10 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRMicrowaveOvenControlClusterSetCookingParametersParams
+@implementation MTRRVCOperationalStateClusterStopParams
 - (instancetype)init
 {
     if (self = [super init]) {
-
-        _cookMode = nil;
-
-        _cookTime = nil;
-
-        _powerSetting = nil;
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -13120,11 +14462,8 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRMicrowaveOvenControlClusterSetCookingParametersParams alloc] init];
+    auto other = [[MTRRVCOperationalStateClusterStopParams alloc] init];
 
-    other.cookMode = self.cookMode;
-    other.cookTime = self.cookTime;
-    other.powerSetting = self.powerSetting;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -13133,36 +14472,18 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: cookMode:%@; cookTime:%@; powerSetting:%@; >", NSStringFromClass([self class]), _cookMode, _cookTime, _powerSetting];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRMicrowaveOvenControlClusterSetCookingParametersParams (InternalMethods)
+@implementation MTRRVCOperationalStateClusterStopParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::MicrowaveOvenControl::Commands::SetCookingParameters::Type encodableStruct;
+    chip::app::Clusters::RvcOperationalState::Commands::Stop::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()) {
@@ -13202,12 +14523,10 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRMicrowaveOvenControlClusterAddMoreTimeParams
+@implementation MTRRVCOperationalStateClusterStartParams
 - (instancetype)init
 {
     if (self = [super init]) {
-
-        _timeToAdd = @(0);
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -13216,9 +14535,8 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRMicrowaveOvenControlClusterAddMoreTimeParams alloc] init];
+    auto other = [[MTRRVCOperationalStateClusterStartParams alloc] init];
 
-    other.timeToAdd = self.timeToAdd;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -13227,21 +14545,18 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: timeToAdd:%@; >", NSStringFromClass([self class]), _timeToAdd];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRMicrowaveOvenControlClusterAddMoreTimeParams (InternalMethods)
+@implementation MTRRVCOperationalStateClusterStartParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::MicrowaveOvenControl::Commands::AddMoreTime::Type encodableStruct;
+    chip::app::Clusters::RvcOperationalState::Commands::Start::Type encodableStruct;
     ListFreer listFreer;
-    {
-        encodableStruct.timeToAdd = self.timeToAdd.unsignedIntValue;
-    }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
     if (buffer.IsNull()) {
@@ -13281,7 +14596,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTROperationalStateClusterPauseParams
+@implementation MTRRVCOperationalStateClusterResumeParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -13293,7 +14608,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTROperationalStateClusterPauseParams alloc] init];
+    auto other = [[MTRRVCOperationalStateClusterResumeParams alloc] init];
 
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
@@ -13309,11 +14624,11 @@ - (NSString *)description
 
 @end
 
-@implementation MTROperationalStateClusterPauseParams (InternalMethods)
+@implementation MTRRVCOperationalStateClusterResumeParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::OperationalState::Commands::Pause::Type encodableStruct;
+    chip::app::Clusters::RvcOperationalState::Commands::Resume::Type encodableStruct;
     ListFreer listFreer;
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
@@ -13354,80 +14669,105 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTROperationalStateClusterStopParams
+@implementation MTRRVCOperationalStateClusterOperationalCommandResponseParams
 - (instancetype)init
 {
     if (self = [super init]) {
-        _timedInvokeTimeoutMs = nil;
-        _serverSideProcessingTimeout = nil;
+
+        _commandResponseState = [MTRRVCOperationalStateClusterErrorStateStruct new];
     }
     return self;
 }
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTROperationalStateClusterStopParams alloc] init];
+    auto other = [[MTRRVCOperationalStateClusterOperationalCommandResponseParams alloc] init];
 
-    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
-    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+    other.commandResponseState = self.commandResponseState;
 
     return other;
 }
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: commandResponseState:%@; >", NSStringFromClass([self class]), _commandResponseState];
     return descriptionString;
 }
 
-@end
-
-@implementation MTROperationalStateClusterStopParams (InternalMethods)
-
-- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
+- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
+                                         error:(NSError * __autoreleasing *)error
 {
-    chip::app::Clusters::OperationalState::Commands::Stop::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::RvcOperationalState::Commands::OperationalCommandResponse::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 MTRRVCOperationalStateClusterOperationalCommandResponseParams (InternalMethods)
+
+- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::DecodableType &)decodableStruct
 {
-    chip::System::PacketBufferTLVReader reader;
-    CHIP_ERROR err = [self _encodeToTLVReader:reader];
-    if (err != CHIP_NO_ERROR) {
-        if (error) {
-            *error = [MTRError errorForCHIPErrorCode:err];
+    {
+        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;
         }
-        return nil;
-    }
-
-    auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
-    if (decodedObj == nil) {
-        if (error) {
-            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        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 decodedObj;
+    return CHIP_NO_ERROR;
 }
+
 @end
 
-@implementation MTROperationalStateClusterStartParams
+@implementation MTRHEPAFilterMonitoringClusterResetConditionParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -13439,7 +14779,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTROperationalStateClusterStartParams alloc] init];
+    auto other = [[MTRHEPAFilterMonitoringClusterResetConditionParams alloc] init];
 
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
@@ -13455,11 +14795,11 @@ - (NSString *)description
 
 @end
 
-@implementation MTROperationalStateClusterStartParams (InternalMethods)
+@implementation MTRHEPAFilterMonitoringClusterResetConditionParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::OperationalState::Commands::Start::Type encodableStruct;
+    chip::app::Clusters::HepaFilterMonitoring::Commands::ResetCondition::Type encodableStruct;
     ListFreer listFreer;
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
@@ -13500,7 +14840,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTROperationalStateClusterResumeParams
+@implementation MTRActivatedCarbonFilterMonitoringClusterResetConditionParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -13512,7 +14852,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTROperationalStateClusterResumeParams alloc] init];
+    auto other = [[MTRActivatedCarbonFilterMonitoringClusterResetConditionParams alloc] init];
 
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
@@ -13528,11 +14868,11 @@ - (NSString *)description
 
 @end
 
-@implementation MTROperationalStateClusterResumeParams (InternalMethods)
+@implementation MTRActivatedCarbonFilterMonitoringClusterResetConditionParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::OperationalState::Commands::Resume::Type encodableStruct;
+    chip::app::Clusters::ActivatedCarbonFilterMonitoring::Commands::ResetCondition::Type encodableStruct;
     ListFreer listFreer;
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
@@ -13573,108 +14913,91 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTROperationalStateClusterOperationalCommandResponseParams
+@implementation MTRBooleanSensorConfigurationClusterSuppressRequestParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _commandResponseState = [MTROperationalStateClusterErrorStateStruct new];
+        _alarmsToSuppress = @(0);
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
     }
     return self;
 }
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTROperationalStateClusterOperationalCommandResponseParams alloc] init];
+    auto other = [[MTRBooleanSensorConfigurationClusterSuppressRequestParams alloc] init];
 
-    other.commandResponseState = self.commandResponseState;
+    other.alarmsToSuppress = self.alarmsToSuppress;
+    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:@"<%@: alarmsToSuppress:%@; >", NSStringFromClass([self class]), _alarmsToSuppress];
     return descriptionString;
 }
 
-- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
-                                         error:(NSError * __autoreleasing *)error
+@end
+
+@implementation MTRBooleanSensorConfigurationClusterSuppressRequestParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    if (!(self = [super init])) {
-        return nil;
+    chip::app::Clusters::BooleanSensorConfiguration::Commands::SuppressRequest::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        encodableStruct.alarmsToSuppress = static_cast<std::remove_reference_t<decltype(encodableStruct.alarmsToSuppress)>>(self.alarmsToSuppress.unsignedCharValue);
     }
 
-    using DecodableType = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::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 MTROperationalStateClusterOperationalCommandResponseParams (InternalMethods)
+    reader.Init(std::move(buffer));
+    return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag());
+}
 
-- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::DecodableType &)decodableStruct
+- (NSDictionary<NSString *, id> * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error
 {
-    {
-        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.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 MTRRVCOperationalStateClusterPauseParams
+@implementation MTRValveConfigurationAndControlClusterOpenParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _openDuration = nil;
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -13683,8 +15006,9 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRVCOperationalStateClusterPauseParams alloc] init];
+    auto other = [[MTRValveConfigurationAndControlClusterOpenParams alloc] init];
 
+    other.openDuration = self.openDuration;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -13693,18 +15017,24 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: openDuration:%@; >", NSStringFromClass([self class]), _openDuration];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRRVCOperationalStateClusterPauseParams (InternalMethods)
+@implementation MTRValveConfigurationAndControlClusterOpenParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::RvcOperationalState::Commands::Pause::Type encodableStruct;
+    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;
+        }
+    }
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
     if (buffer.IsNull()) {
@@ -13744,7 +15074,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRRVCOperationalStateClusterStopParams
+@implementation MTRValveConfigurationAndControlClusterCloseParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -13756,7 +15086,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRVCOperationalStateClusterStopParams alloc] init];
+    auto other = [[MTRValveConfigurationAndControlClusterCloseParams alloc] init];
 
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
@@ -13772,11 +15102,11 @@ - (NSString *)description
 
 @end
 
-@implementation MTRRVCOperationalStateClusterStopParams (InternalMethods)
+@implementation MTRValveConfigurationAndControlClusterCloseParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::RvcOperationalState::Commands::Stop::Type encodableStruct;
+    chip::app::Clusters::ValveConfigurationAndControl::Commands::Close::Type encodableStruct;
     ListFreer listFreer;
 
     auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0);
@@ -13817,10 +15147,14 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRRVCOperationalStateClusterStartParams
+@implementation MTRValveConfigurationAndControlClusterSetLevelParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _level = @(0);
+
+        _openDuration = nil;
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -13829,8 +15163,10 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRVCOperationalStateClusterStartParams alloc] init];
+    auto other = [[MTRValveConfigurationAndControlClusterSetLevelParams alloc] init];
 
+    other.level = self.level;
+    other.openDuration = self.openDuration;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -13839,18 +15175,27 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: level:%@; openDuration:%@; >", NSStringFromClass([self class]), _level, _openDuration];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRRVCOperationalStateClusterStartParams (InternalMethods)
+@implementation MTRValveConfigurationAndControlClusterSetLevelParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::RvcOperationalState::Commands::Start::Type encodableStruct;
+    chip::app::Clusters::ValveConfigurationAndControl::Commands::SetLevel::Type encodableStruct;
     ListFreer listFreer;
+    {
+        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);
     if (buffer.IsNull()) {
@@ -13890,10 +15235,12 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRRVCOperationalStateClusterResumeParams
+@implementation MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _loadControlProgram = [MTRDemandResponseLoadControlClusterLoadControlProgramStruct new];
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -13902,8 +15249,9 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRVCOperationalStateClusterResumeParams alloc] init];
+    auto other = [[MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams alloc] init];
 
+    other.loadControlProgram = self.loadControlProgram;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -13912,18 +15260,40 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
 - (NSString *)description
 {
-    NSString * descriptionString = [NSString stringWithFormat:@"<%@: >", NSStringFromClass([self class])];
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: loadControlProgram:%@; >", NSStringFromClass([self class]), _loadControlProgram];
     return descriptionString;
 }
 
 @end
 
-@implementation MTRRVCOperationalStateClusterResumeParams (InternalMethods)
+@implementation MTRDemandResponseLoadControlClusterRegisterLoadControlProgramRequestParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::RvcOperationalState::Commands::Resume::Type encodableStruct;
+    chip::app::Clusters::DemandResponseLoadControl::Commands::RegisterLoadControlProgramRequest::Type encodableStruct;
     ListFreer listFreer;
+    {
+        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);
     if (buffer.IsNull()) {
@@ -13963,108 +15333,269 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRRVCOperationalStateClusterOperationalCommandResponseParams
+@implementation MTRDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestParams
 - (instancetype)init
 {
     if (self = [super init]) {
 
-        _commandResponseState = [MTRRVCOperationalStateClusterErrorStateStruct new];
+        _loadControlProgramID = [NSData data];
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
     }
     return self;
 }
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRRVCOperationalStateClusterOperationalCommandResponseParams alloc] init];
+    auto other = [[MTRDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestParams alloc] init];
 
-    other.commandResponseState = self.commandResponseState;
+    other.loadControlProgramID = self.loadControlProgramID;
+    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:@"<%@: loadControlProgramID:%@; >", NSStringFromClass([self class]), [_loadControlProgramID base64EncodedStringWithOptions:0]];
     return descriptionString;
 }
 
-- (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)responseValue
-                                         error:(NSError * __autoreleasing *)error
+@end
+
+@implementation MTRDemandResponseLoadControlClusterUnregisterLoadControlProgramRequestParams (InternalMethods)
+
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    if (!(self = [super init])) {
-        return nil;
+    chip::app::Clusters::DemandResponseLoadControl::Commands::UnregisterLoadControlProgramRequest::Type encodableStruct;
+    ListFreer listFreer;
+    {
+        encodableStruct.loadControlProgramID = AsByteSpan(self.loadControlProgramID);
     }
 
-    using DecodableType = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::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::System::PacketBufferTLVWriter writer;
+    // Commands never need chained buffers, since they cannot be chunked.
+    writer.Init(std::move(buffer), /* useChainedBuffers = */ false);
 
-    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;
-            }
+    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;
     }
 
-    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 decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader);
+    if (decodedObj == nil) {
+        if (error) {
+            *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE];
+        }
     }
-    return nil;
+    return decodedObj;
+}
+@end
+
+@implementation MTRDemandResponseLoadControlClusterAddLoadControlEventRequestParams
+- (instancetype)init
+{
+    if (self = [super init]) {
+
+        _event = [MTRDemandResponseLoadControlClusterLoadControlEventStruct new];
+        _timedInvokeTimeoutMs = nil;
+        _serverSideProcessingTimeout = nil;
+    }
+    return self;
+}
+
+- (id)copyWithZone:(NSZone * _Nullable)zone;
+{
+    auto other = [[MTRDemandResponseLoadControlClusterAddLoadControlEventRequestParams alloc] init];
+
+    other.event = self.event;
+    other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
+    other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
+
+    return other;
+}
+
+- (NSString *)description
+{
+    NSString * descriptionString = [NSString stringWithFormat:@"<%@: event:%@; >", NSStringFromClass([self class]), _event];
+    return descriptionString;
 }
 
 @end
 
-@implementation MTRRVCOperationalStateClusterOperationalCommandResponseParams (InternalMethods)
+@implementation MTRDemandResponseLoadControlClusterAddLoadControlEventRequestParams (InternalMethods)
 
-- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::DecodableType &)decodableStruct
+- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
+    chip::app::Clusters::DemandResponseLoadControl::Commands::AddLoadControlEventRequest::Type encodableStruct;
+    ListFreer listFreer;
     {
-        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;
-            }
+        encodableStruct.event.eventID = AsByteSpan(self.event.eventID);
+        if (self.event.programID == nil) {
+            encodableStruct.event.programID.SetNull();
         } else {
-            self.commandResponseState.errorStateLabel = nil;
+            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;
         }
-        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;
+        {
+            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 = static_cast<std::remove_reference_t<decltype(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();
             }
-        } else {
-            self.commandResponseState.errorStateDetails = nil;
         }
     }
-    return CHIP_NO_ERROR;
+
+    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 MTRHEPAFilterMonitoringClusterResetConditionParams
+@implementation MTRDemandResponseLoadControlClusterRemoveLoadControlEventRequestParams
 - (instancetype)init
 {
     if (self = [super init]) {
+
+        _eventID = [NSData data];
+
+        _cancelControl = @(0);
         _timedInvokeTimeoutMs = nil;
         _serverSideProcessingTimeout = nil;
     }
@@ -14073,8 +15604,10 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRHEPAFilterMonitoringClusterResetConditionParams alloc] init];
+    auto other = [[MTRDemandResponseLoadControlClusterRemoveLoadControlEventRequestParams alloc] init];
 
+    other.eventID = self.eventID;
+    other.cancelControl = self.cancelControl;
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
 
@@ -14083,18 +15616,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 MTRHEPAFilterMonitoringClusterResetConditionParams (InternalMethods)
+@implementation MTRDemandResponseLoadControlClusterRemoveLoadControlEventRequestParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::HepaFilterMonitoring::Commands::ResetCondition::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()) {
@@ -14134,7 +15673,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 }
 @end
 
-@implementation MTRActivatedCarbonFilterMonitoringClusterResetConditionParams
+@implementation MTRDemandResponseLoadControlClusterClearLoadControlEventsRequestParams
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -14146,7 +15685,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
-    auto other = [[MTRActivatedCarbonFilterMonitoringClusterResetConditionParams alloc] init];
+    auto other = [[MTRDemandResponseLoadControlClusterClearLoadControlEventsRequestParams alloc] init];
 
     other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs;
     other.serverSideProcessingTimeout = self.serverSideProcessingTimeout;
@@ -14162,11 +15701,11 @@ - (NSString *)description
 
 @end
 
-@implementation MTRActivatedCarbonFilterMonitoringClusterResetConditionParams (InternalMethods)
+@implementation MTRDemandResponseLoadControlClusterClearLoadControlEventsRequestParams (InternalMethods)
 
 - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader
 {
-    chip::app::Clusters::ActivatedCarbonFilterMonitoring::Commands::ResetCondition::Type encodableStruct;
+    chip::app::Clusters::DemandResponseLoadControl::Commands::ClearLoadControlEventsRequest::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 0698f0c97c7a3b..d50b8661ca0e9a 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;
@@ -736,6 +748,42 @@ NS_ASSUME_NONNULL_BEGIN
 
 @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 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;
@@ -910,6 +958,60 @@ 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 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 12568cfb9671e9..59217410fa3be4 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm
@@ -374,6 +374,24 @@ static BOOL CommandNeedsTimedInvokeInICDManagementCluster(AttributeId aAttribute
     }
     }
 }
+static BOOL CommandNeedsTimedInvokeInTimerCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::Timer;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
+static BOOL CommandNeedsTimedInvokeInOvenModeCluster(AttributeId aAttributeId)
+{
+    using namespace Clusters::OvenMode;
+    switch (aAttributeId) {
+    default: {
+        return NO;
+    }
+    }
+}
 static BOOL CommandNeedsTimedInvokeInModeSelectCluster(AttributeId aAttributeId)
 {
     using namespace Clusters::ModeSelect;
@@ -536,6 +554,33 @@ 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 CommandNeedsTimedInvokeInDoorLockCluster(AttributeId aAttributeId)
 {
     using namespace Clusters::DoorLock;
@@ -1053,6 +1098,12 @@ BOOL MTRCommandNeedsTimedInvoke(NSNumber * _Nonnull aClusterID, NSNumber * _Nonn
     case Clusters::IcdManagement::Id: {
         return CommandNeedsTimedInvokeInICDManagementCluster(commandID);
     }
+    case Clusters::Timer::Id: {
+        return CommandNeedsTimedInvokeInTimerCluster(commandID);
+    }
+    case Clusters::OvenMode::Id: {
+        return CommandNeedsTimedInvokeInOvenModeCluster(commandID);
+    }
     case Clusters::ModeSelect::Id: {
         return CommandNeedsTimedInvokeInModeSelectCluster(commandID);
     }
@@ -1107,6 +1158,15 @@ 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::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..43f045900f6aaf 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" },
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
index 1b857e0ab5d2e4..c7c856671a917f 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
@@ -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,30 @@ 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 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 DecodeEventPayloadForModeSelectCluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
 {
     using namespace Clusters::ModeSelect;
@@ -1742,7 +1756,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 +1788,6 @@ static id _Nullable DecodeEventPayloadForRefrigeratorAlarmCluster(EventId aEvent
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -1812,7 +1824,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 +1841,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 +1858,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 +1875,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 +1886,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 +1897,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 +1908,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 +1919,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 +1930,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 +1947,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 +1964,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 +1975,6 @@ static id _Nullable DecodeEventPayloadForSmokeCOAlarmCluster(EventId aEventId, T
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -1997,7 +1987,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 +2019,6 @@ static id _Nullable DecodeEventPayloadForDishwasherAlarmCluster(EventId aEventId
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -2067,7 +2055,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);
@@ -2106,8 +2093,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);
@@ -2151,7 +2136,6 @@ static id _Nullable DecodeEventPayloadForOperationalStateCluster(EventId aEventI
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -2164,7 +2148,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);
@@ -2203,8 +2186,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);
@@ -2248,7 +2229,6 @@ static id _Nullable DecodeEventPayloadForRVCOperationalStateCluster(EventId aEve
 
         return value;
     }
-#endif // MTR_ENABLE_PROVISIONAL
     default: {
         break;
     }
@@ -2281,6 +2261,259 @@ 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:chip::to_underlying(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 DecodeEventPayloadForDoorLockCluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError)
 {
     using namespace Clusters::DoorLock;
@@ -3441,6 +3674,12 @@ 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::OvenMode::Id: {
+        return DecodeEventPayloadForOvenModeCluster(aPath.mEventId, aReader, aError);
+    }
     case Clusters::ModeSelect::Id: {
         return DecodeEventPayloadForModeSelectCluster(aPath.mEventId, aReader, aError);
     }
@@ -3495,6 +3734,15 @@ 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::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 3c197167dacc2c..200f5285877c8d 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_NEWLY_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))
@@ -778,6 +790,19 @@ MTR_PROVISIONALLY_AVAILABLE
 @property (nonatomic, copy) NSNumber * _Nonnull fabricIndex 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));
@@ -1002,6 +1027,100 @@ 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_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 c7000fa3be2752..52086da233a48f 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;
 }
 
@@ -2872,6 +2920,69 @@ - (NSString *)description
 
 @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
 {
@@ -3969,6 +4080,443 @@ - (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 MTRDoorLockClusterCredentialStruct
 - (instancetype)init
 {
diff --git a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
index 53ce6ed70871b9..a7f00d50661487 100644
--- a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
+++ b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj
@@ -1901,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;
 		};
@@ -1970,6 +1977,13 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;
 				USER_HEADER_SEARCH_PATHS = "";
+				WARNING_CFLAGS = (
+					"-Wformat",
+					"-Wformat-nonliteral",
+					"-Wformat-security",
+					"-Wconversion",
+					"-Wno-documentation",
+				);
 			};
 			name = Release;
 		};
@@ -2060,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",
@@ -2225,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",
diff --git a/src/include/platform/CHIPDeviceConfig.h b/src/include/platform/CHIPDeviceConfig.h
index e29c00161337db..c5b2359fdcab89 100644
--- a/src/include/platform/CHIPDeviceConfig.h
+++ b/src/include/platform/CHIPDeviceConfig.h
@@ -346,6 +346,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
  *
diff --git a/src/include/platform/ConfigurationManager.h b/src/include/platform/ConfigurationManager.h
index 29addac5cb88d4..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
 
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/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..90b0d515269147 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(),
@@ -276,6 +284,72 @@ 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
+
     ~WiFiDriver() 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/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/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/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 4252232e6e9ba8..8423649ca928a0 100644
--- a/src/lib/address_resolve/tool.cpp
+++ b/src/lib/address_resolve/tool.cpp
@@ -119,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 7363fb2b8d42ee..fb04f9bbefd943 100644
--- a/src/lib/core/CHIPConfig.h
+++ b/src/lib/core/CHIPConfig.h
@@ -1600,6 +1600,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/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 7942b7f803bec9..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;
 }
 
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/dnssd/Advertiser_ImplMinimalMdns.cpp b/src/lib/dnssd/Advertiser_ImplMinimalMdns.cpp
index 19558e9b37d083..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>
@@ -230,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)
                 {
diff --git a/src/lib/dnssd/Discovery_ImplPlatform.cpp b/src/lib/dnssd/Discovery_ImplPlatform.cpp
index 4ebcde1d247024..9af17d2288024f 100644
--- a/src/lib/dnssd/Discovery_ImplPlatform.cpp
+++ b/src/lib/dnssd/Discovery_ImplPlatform.cpp
@@ -224,6 +224,16 @@ 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);
diff --git a/src/lib/dnssd/minimal_mdns/tests/TestAdvertiser.cpp b/src/lib/dnssd/minimal_mdns/tests/TestAdvertiser.cpp
index cd8afdffa1771d..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,17 +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>(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",
-                                                              "ICD=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;
 
@@ -454,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 81a54956788861..39316ae129bd36 100644
--- a/src/lib/dnssd/minimal_mdns/tests/TestResponseSender.cpp
+++ b/src/lib/dnssd/minimal_mdns/tests/TestResponseSender.cpp
@@ -312,10 +312,8 @@ void PtrSrvTxtMultipleRespondersToInstance(nlTestSuite * inSuite, void * inConte
 
 void PtrSrvTxtMultipleRespondersToServiceListing(nlTestSuite * inSuite, void * inContext)
 {
-    // CommonTestElements common1(inSuite, "test1");
-    // CommonTestElements common2(inSuite, "test2");
-    auto common1 = new CommonTestElements(inSuite, "test1");
-    auto common2 = new CommonTestElements(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);
 
@@ -342,10 +340,8 @@ void PtrSrvTxtMultipleRespondersToServiceListing(nlTestSuite * inSuite, void * i
     responseSender.Respond(1, queryData, &common1->packetInfo, ResponseConfiguration());
 
     NL_TEST_ASSERT(inSuite, common1->server.GetSendCalled());
-    NL_TEST_ASSERT(inSuite, common1->server.GetHeaderFound());
 
-    delete common1;
-    delete common2;
+    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 b6ec1581d45a1b..93141ca403dc6a 100644
--- a/src/lib/dnssd/platform/tests/TestPlatform.cpp
+++ b/src/lib/dnssd/platform/tests/TestPlatform.cpp
@@ -98,7 +98,7 @@ CommissionAdvertisingParameters commissionableNodeParamsLargeBasic =
         .SetProductId(Optional<uint16_t>(897))
         .SetRotatingDeviceId(Optional<const char *>("id_that_spins"))
         .SetTcpSupported(Optional<bool>(true))
-        .SetICDOperatingAsLIT(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));
 
@@ -115,7 +115,7 @@ test::ExpectedCall commissionableLargeBasic = test::ExpectedCall()
                                                   .AddTxt("PI", "Pair me")
                                                   .AddTxt("PH", "3")
                                                   .AddTxt("T", "1")
-                                                  .AddTxt("ICD", "1")
+                                                  .AddTxt("ICD", "0")
                                                   .AddTxt("SII", "3600000")
                                                   .AddTxt("SAI", "3600000")
                                                   .AddTxt("SAT", "65535")
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/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/ReliableMessageMgr.cpp b/src/messaging/ReliableMessageMgr.cpp
index e22bd4db24a517..53d0487b7b826b 100644
--- a/src/messaging/ReliableMessageMgr.cpp
+++ b/src/messaging/ReliableMessageMgr.cpp
@@ -89,9 +89,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 +103,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) {
@@ -397,8 +398,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/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..39d94748c117a6 100644
--- a/src/platform/BUILD.gn
+++ b/src/platform/BUILD.gn
@@ -371,6 +371,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 +398,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 +424,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/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/Linux/BLEManagerImpl.cpp b/src/platform/Linux/BLEManagerImpl.cpp
index 01a93a29b8a1ed..196dd480872f84 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)
+    // 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;
-}
+    mBLEAdvType       = ChipAdvType::BLUEZ_ADV_TYPE_UNDIRECTED_CONNECTABLE_SCANNABLE;
+    mBLEAdvDurationMs = 2;
+    mpBLEAdvUUID      = "0xFFF6";
 
-CHIP_ERROR BLEManagerImpl::StartBLEAdvertising()
-{
-    return StartBluezAdv(mpEndpoint);
-}
-
-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();
@@ -675,14 +648,14 @@ 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");
@@ -691,7 +664,7 @@ void BLEManagerImpl::InitiateScan(BleScanState scanType)
 
     mBLEScanConfig.mBleScanState = scanType;
 
-    CHIP_ERROR err = mDeviceScanner.Init(mpEndpoint->mpAdapter, this);
+    CHIP_ERROR err = mDeviceScanner.Init(mEndpoint.GetAdapter(), this);
     if (err != CHIP_NO_ERROR)
     {
         mBLEScanConfig.mBleScanState = BleScanState::kNotScanning;
@@ -713,7 +686,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,7 +708,7 @@ 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();
@@ -751,15 +724,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 +772,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();
 
-    ConnectDevice(device, mpEndpoint);
+    mEndpoint.ConnectDevice(device);
 }
 
 void BLEManagerImpl::OnScanComplete()
diff --git a/src/platform/Linux/BLEManagerImpl.h b/src/platform/Linux/BLEManagerImpl.h
index 458bac267db832..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;
+    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/ConnectivityUtils.cpp b/src/platform/Linux/ConnectivityUtils.cpp
index 2924d48612317e..01e41af7c583bd 100644
--- a/src/platform/Linux/ConnectivityUtils.cpp
+++ b/src/platform/Linux/ConnectivityUtils.cpp
@@ -658,34 +658,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/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 5621e412edec72..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,225 +79,11 @@ 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);
-    g_object_unref(endpoint->mpAdv);
-    endpoint->mpAdv          = nullptr;
-    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)
-{
-    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__));
-
-    endpoint->mpAdv = BluezAdvertisingCreate(endpoint);
-    VerifyOrExit(endpoint->mpAdv != 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;
 }
@@ -311,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
@@ -322,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);
 
@@ -360,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
@@ -378,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))
@@ -391,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__);
@@ -427,21 +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 BluezCharacteristicConfirm(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInvocation,
-                                           gpointer apClosure)
+gboolean BluezEndpoint::BluezCharacteristicConfirm(BluezGattCharacteristic1 * aChar, GDBusMethodInvocation * aInvocation)
 {
-    BluezEndpoint * endpoint = static_cast<BluezEndpoint *>(apClosure);
-    BluezConnection * conn   = GetBluezConnectionViaDevice(endpoint);
-
+    BluezConnection * conn = GetBluezConnectionViaDevice();
     ChipLogDetail(Ble, "Indication confirmation, %p", conn);
     BLEManagerImpl::HandleTXComplete(conn);
-
     return TRUE;
 }
 
@@ -456,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);
@@ -497,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));
@@ -515,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.
@@ -588,174 +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;
+    char expectedPath[32];
+    snprintf(expectedPath, sizeof(expectedPath), BLUEZ_PATH "/hci%u", mAdapterId);
 
-    VerifyOrExit(apEndpoint != nullptr, ChipLogError(DeviceLayer, "endpoint is NULL in %s", __func__));
-
-    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)
-    {
-        g_free(apEndpoint->mpOwningName);
-        g_free(apEndpoint->mpAdapterName);
-        g_free(apEndpoint->mpAdapterAddr);
-        g_free(apEndpoint->mpRootPath);
-        g_free(apEndpoint->mpAdvPath);
-        g_free(apEndpoint->mpServicePath);
-        if (apEndpoint->mpObjMgr != nullptr)
-            g_object_unref(apEndpoint->mpObjMgr);
-        if (apEndpoint->mpAdapter != nullptr)
-            g_object_unref(apEndpoint->mpAdapter);
-        if (apEndpoint->mpDevice != nullptr)
-            g_object_unref(apEndpoint->mpDevice);
-        if (apEndpoint->mpRoot != nullptr)
-            g_object_unref(apEndpoint->mpRoot);
-        if (apEndpoint->mpService != nullptr)
-            g_object_unref(apEndpoint->mpService);
-        if (apEndpoint->mpC1 != nullptr)
-            g_object_unref(apEndpoint->mpC1);
-        if (apEndpoint->mpC2 != nullptr)
-            g_object_unref(apEndpoint->mpC2);
-        if (apEndpoint->mpC3 != nullptr)
-            g_object_unref(apEndpoint->mpC3);
-        if (apEndpoint->mpAdv != nullptr)
-            g_object_unref(apEndpoint->mpAdv);
-        if (apEndpoint->mpConnMap != nullptr)
-            g_hash_table_destroy(apEndpoint->mpConnMap);
-        g_free(apEndpoint->mpAdvertisingUUID);
-        g_free(apEndpoint->mpPeerDevicePath);
-        if (apEndpoint->mpConnectCancellable != nullptr)
-            g_object_unref(apEndpoint->mpConnectCancellable);
-        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;
@@ -797,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 };
@@ -806,237 +534,214 @@ static void BluezPeripheralObjectsSetup(BluezEndpoint * endpoint)
     static const char * const c3_flags[] = { "read", nullptr };
 #endif
 
-    endpoint->mpService = BluezServiceCreate(endpoint);
-    // 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-acquire-write", G_CALLBACK(BluezCharacteristicAcquireWrite), endpoint);
-    g_signal_connect(endpoint->mpC1, "handle-acquire-notify", G_CALLBACK(BluezCharacteristicAcquireNotifyError), nullptr);
-    g_signal_connect(endpoint->mpC1, "handle-confirm", G_CALLBACK(BluezCharacteristicConfirmError), nullptr);
+    mpService = CreateGattService(CHIP_BLE_UUID_SERVICE_SHORT_STRING);
 
-    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-acquire-write", G_CALLBACK(BluezCharacteristicAcquireWriteError), nullptr);
-    g_signal_connect(endpoint->mpC2, "handle-acquire-notify", G_CALLBACK(BluezCharacteristicAcquireNotify), 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));
+    // C1 characteristic
+    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-acquire-write", G_CALLBACK(BluezCharacteristicAcquireWriteError), nullptr);
-    g_signal_connect(endpoint->mpC3, "handle-acquire-notify", G_CALLBACK(BluezCharacteristicAcquireNotify), 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);
-
-        BluezPeripheralObjectsSetup(endpoint);
-    }
+    SetupGattService();
 
-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);
-
-#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 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)
+void BluezEndpoint::Shutdown()
 {
-    VerifyOrReturnError(apEndpoint != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
+    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.
-    return PlatformMgrImpl().GLibMatterContextInvokeSync(
-        +[](BluezEndpoint * endpoint) {
-            EndpointCleanup(endpoint);
+    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;
         },
-        apEndpoint);
+        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
-{
-    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)
+void BluezEndpoint::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);
 
@@ -1051,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;
         }
 
@@ -1065,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)
@@ -1094,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 982eb053be6667..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,20 +63,81 @@ 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) subscribed to by this service
     GDBusObjectManager * mpObjMgr = nullptr;
@@ -81,39 +145,20 @@ struct BluezEndpoint
     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;
-
-    // Objects (interfaces) used by LE advertisement
-    BluezLEAdvertisement1 * mpAdv;
-
-    // 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/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..0ceab55fbd3335 100644
--- a/src/platform/Tizen/ConnectivityUtils.cpp
+++ b/src/platform/Tizen/ConnectivityUtils.cpp
@@ -447,34 +447,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/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/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/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/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/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/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..646dc209c36ff2 100644
--- a/src/platform/webos/ConnectivityUtils.cpp
+++ b/src/platform/webos/ConnectivityUtils.cpp
@@ -566,34 +566,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/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..57375646a202b2 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()->SetRemoteMRPConfig(GetRemoteMRPConfig());
     }
 
     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()->SetRemoteMRPConfig(GetRemoteMRPConfig());
     }
 
 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()->SetRemoteMRPConfig(GetRemoteMRPConfig());
         err = tlvReader.Next();
     }
 
diff --git a/src/protocols/secure_channel/PASESession.cpp b/src/protocols/secure_channel/PASESession.cpp
index 966bc1dbe8dae0..8e2f27f176cfca 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()->SetRemoteMRPConfig(GetRemoteMRPConfig());
     }
 
     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()->SetRemoteMRPConfig(GetRemoteMRPConfig());
         }
 
         // 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()->SetRemoteMRPConfig(GetRemoteMRPConfig());
         }
     }
 
diff --git a/src/protocols/secure_channel/PairingSession.cpp b/src/protocols/secure_channel/PairingSession.cpp
index af555bfeee5046..d3c6e96c1ef8bd 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, GetRemoteMRPConfig());
 
     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..039705efa16745 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,14 @@ 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(); }
+    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 +201,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 +232,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/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 2288c7c5a4b596..30a4353f7ffe88 100644
--- a/src/python_testing/TC_DeviceBasicComposition.py
+++ b/src/python_testing/TC_DeviceBasicComposition.py
@@ -15,108 +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 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 mobly import asserts
-from spec_parsing_support import CommandType, build_xml_clusters
-
-ATTRIBUTE_LIST_ID = 0xFFFB
-ACCEPTED_COMMAND_LIST_ID = 0xFFF9
-GENERATED_COMMAND_LIST_ID = 0xFFF8
-FEATURE_MAP_ID = 0xFFFC
-CLUSTER_REVISION_ID = 0xFFFD
-
-
-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:
@@ -186,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.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)
+        await self.setup_class_helper()
 
     # ======= START OF ACTUAL TESTS =======
     def test_TC_SM_1_1(self):
@@ -482,15 +175,17 @@ class RequiredMandatoryAttribute:
             validators: list[Callable]
 
         ATTRIBUTES_TO_CHECK = [
-            RequiredMandatoryAttribute(id=CLUSTER_REVISION_ID, name="ClusterRevision", validators=[check_int_in_range(1, 0xFFFF)]),
-            RequiredMandatoryAttribute(id=FEATURE_MAP_ID, name="FeatureMap", validators=[check_int_in_range(0, 0xFFFF_FFFF)]),
-            RequiredMandatoryAttribute(id=ATTRIBUTE_LIST_ID, 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=ACCEPTED_COMMAND_LIST_ID, 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=GENERATED_COMMAND_LIST_ID, name="GeneratedCommandList",
+            RequiredMandatoryAttribute(id=GlobalAttributeIds.GENERATED_COMMAND_LIST_ID, name="GeneratedCommandList",
                                        validators=[check_list_of_ints_in_range(0, 0xFFFF_FFFF), check_no_duplicates]),
         ]
 
@@ -532,7 +227,7 @@ class RequiredMandatoryAttribute:
         if success:
             for endpoint_id, endpoint in self.endpoints_tlv.items():
                 for cluster_id, cluster in endpoint.items():
-                    attribute_list = cluster[ATTRIBUTE_LIST_ID]
+                    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
@@ -579,7 +274,7 @@ class RequiredMandatoryAttribute:
         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)
@@ -593,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 <= attribute_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:
@@ -606,7 +302,7 @@ class RequiredMandatoryAttribute:
         # 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 >
+                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)
@@ -620,8 +316,10 @@ class RequiredMandatoryAttribute:
             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[ACCEPTED_COMMAND_LIST_ID] if a <= command_standard_range_max]
-                standard_generated_commands = [a for a in cluster[GENERATED_COMMAND_LIST_ID] if a <= command_standard_range_max]
+                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:
@@ -658,8 +356,9 @@ class RequiredMandatoryAttribute:
             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[ATTRIBUTE_LIST_ID]]
-                cmd_values = cluster[ACCEPTED_COMMAND_LIST_ID] + cluster[GENERATED_COMMAND_LIST_ID]
+                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]
@@ -679,7 +378,7 @@ class RequiredMandatoryAttribute:
         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,
@@ -697,8 +396,10 @@ class RequiredMandatoryAttribute:
 
         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[ACCEPTED_COMMAND_LIST_ID] if a > mei_range_min]
-                generated_manufacturer_range_values = [a for a in cluster[GENERATED_COMMAND_LIST_ID] if a > mei_range_min]
+                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
@@ -743,7 +444,7 @@ class RequiredMandatoryAttribute:
             for cluster_id, cluster in endpoint.items():
                 if cluster_id not in chip.clusters.ClusterObjects.ALL_CLUSTERS:
                     continue
-                feature_map = cluster[FEATURE_MAP_ID]
+                feature_map = cluster[GlobalAttributeIds.FEATURE_MAP_ID]
                 feature_mask = 0
                 try:
                     feature_map_enum = chip.clusters.ClusterObjects.ALL_CLUSTERS[cluster_id].Bitmaps.Feature
@@ -1004,147 +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):
-        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]] = {}
-        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]}
-            ignore_attributes.update(in_progress_attributes)
-
-        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)
-        clusters, problems = build_xml_clusters()
-        self.problems = self.problems + problems
-        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
-
-                feature_map = cluster[FEATURE_MAP_ID]
-                attribute_list = cluster[ATTRIBUTE_LIST_ID]
-                all_command_list = cluster[ACCEPTED_COMMAND_LIST_ID] + cluster[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=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. {conformance_str(xml_feature.conformance, feature_map, 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 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. {conformance_str(xml_attribute.conformance, feature_map, clusters[cluster_id].features)}')
-                        success = False
-                for attribute_id, xml_attribute in 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, clusters[cluster_id].features)}')
-                        success = False
-
-                def check_spec_conformance_for_commands(command_type: CommandType) -> bool:
-                    success = True
-                    global_attribute_id = ACCEPTED_COMMAND_LIST_ID if command_type == CommandType.ACCEPTED else GENERATED_COMMAND_LIST_ID
-                    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. {conformance_str(xml_command.conformance, feature_map, 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, 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:
-            # 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/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/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 759e6cdf377366..1b3fab9b8c8a3e 100644
--- a/src/python_testing/matter_testing_support.py
+++ b/src/python_testing/matter_testing_support.py
@@ -443,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()
diff --git a/src/python_testing/spec_parsing_support.py b/src/python_testing/spec_parsing_support.py
index b59ef8379e9e63..b73d6877445e8a 100644
--- a/src/python_testing/spec_parsing_support.py
+++ b/src/python_testing/spec_parsing_support.py
@@ -24,10 +24,11 @@
 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, or_operation, parse_callable_from_xml)
 from matter_testing_support import (AttributePathLocation, ClusterPathLocation, CommandPathLocation, EventPathLocation,
                                     FeaturePathLocation, ProblemNotice, ProblemSeverity)
 
@@ -246,7 +247,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(),
@@ -324,22 +329,44 @@ def build_xml_clusters() -> tuple[list[XmlCluster], list[ProblemNotice]]:
             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
-    aliased_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'}
-    alias_base_name = 'Concentration Measurement Clusters'
-    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
+    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 283e3b7c49bcbd..cc0293ea864642 100644
--- a/src/system/BUILD.gn
+++ b/src/system/BUILD.gn
@@ -166,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" ]
@@ -220,7 +222,6 @@ static_library("system") {
     "SystemAlignSize.h",
     "SystemClock.cpp",
     "SystemClock.h",
-    "SystemConfig.h",
     "SystemError.cpp",
     "SystemError.h",
     "SystemEvent.h",
@@ -253,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/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/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 5064e16813d79b..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
@@ -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
@@ -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 82108957e4c4fd..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:24
+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:24 /bin/bash
+    ghcr.io/project-chip/chip-build-tizen-qemu:26 /bin/bash
 ```
 
 ### Clone the connectedhomeip repository
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/src/tools/interop/idt/capture/platform/android/streams/logcat/__init__.py b/src/tools/interop/idt/capture/platform/android/streams/logcat/__init__.py
new file mode 100644
index 00000000000000..eebc071333d89e
--- /dev/null
+++ b/src/tools/interop/idt/capture/platform/android/streams/logcat/__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 .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/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/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/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/imgui/repo b/third_party/imgui/repo
index 1ab63d925f21e0..454f36d2af9d92 160000
--- a/third_party/imgui/repo
+++ b/third_party/imgui/repo
@@ -1 +1 @@
-Subproject commit 1ab63d925f21e03be7735661500e5b914dd93c19
+Subproject commit 454f36d2af9d92a0f8ffe8536c218247df732edc
diff --git a/third_party/libwebsockets/repo b/third_party/libwebsockets/repo
index 26c3f9a01bb41d..288f36fc8178e2 160000
--- a/third_party/libwebsockets/repo
+++ b/third_party/libwebsockets/repo
@@ -1 +1 @@
-Subproject commit 26c3f9a01bb41d75126dc6817459b7c4a3491431
+Subproject commit 288f36fc8178e2664614b78322d2d05a70b9ac0a
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..e44be6a7d3d31f 160000
--- a/third_party/mbedtls/repo
+++ b/third_party/mbedtls/repo
@@ -1 +1 @@
-Subproject commit da635ab65760bf1d6fe4abf0121aab2b6d2a5bad
+Subproject commit e44be6a7d3d31f3fac1a74b262b395984d193b05
diff --git a/third_party/nanopb/repo b/third_party/nanopb/repo
index 9766c4589f61b7..9aa922d9dbaf14 160000
--- a/third_party/nanopb/repo
+++ b/third_party/nanopb/repo
@@ -1 +1 @@
-Subproject commit 9766c4589f61b76807a0a394040c15a2d23ef24c
+Subproject commit 9aa922d9dbaf147b07cc0fdb2392a9995c4e95db
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/ot-br-posix/repo b/third_party/ot-br-posix/repo
index 184d2982d28c28..f6263d1e5a95e4 160000
--- a/third_party/ot-br-posix/repo
+++ b/third_party/ot-br-posix/repo
@@ -1 +1 @@
-Subproject commit 184d2982d28c289420df74453b941cce93e297a8
+Subproject commit f6263d1e5a95e48e826bb56fe92eedb7f98b522a
diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo
index 90d97fa3b4292c..5eccd87a773568 160000
--- a/third_party/pigweed/repo
+++ b/third_party/pigweed/repo
@@ -1 +1 @@
-Subproject commit 90d97fa3b4292c39074e6f2b94dbd1cffa6ee318
+Subproject commit 5eccd87a773568f5db5f5e7f1dd0809860f3d01e
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/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 e443c17c0e92f1..a3a3fbc23f1b03 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)
@@ -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,169 @@ 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, uint16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ true, 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::ModeSelect::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::Timer::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-EmberAfStatus SetNull(chip::EndpointId endpoint)
+} // namespace FeatureMap
+
+namespace ClusterRevision {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_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);
+    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, const chip::app::DataModel::Nullable<uint16_t> & value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    if (value.IsNull())
+    using Traits = NumericAttributeTraits<uint16_t>;
+    if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
-        return SetNull(endpoint);
+        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
     }
-
-    return Set(endpoint, value.Value());
+    Traits::StorageType storageValue;
+    Traits::WorkingToStorage(value, storageValue);
+    uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue);
+    return emberAfWriteAttribute(endpoint, Clusters::Timer::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace StandardNamespace
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace Timer
+
+namespace OvenMode {
+namespace Attributes {
 
 namespace CurrentMode {
 
@@ -6698,7 +6806,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 +6825,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 +6837,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 +6859,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 +6868,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 +6890,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 +6912,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 +6921,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 +6943,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 +6962,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 +6974,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,101 +6993,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::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 ModeSelect {
 namespace Attributes {
 
-namespace ClusterRevision {
+namespace Description {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan & value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
-    Traits::StorageType temp;
-    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryWasherMode::Id, Id, readable, sizeof(temp));
+    uint8_t zclString[64 + 1];
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ModeSelect::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 = Traits::StorageToWorking(temp);
+
+    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, 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::LaundryWasherMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    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 ClusterRevision
-
-} // namespace Attributes
-} // namespace LaundryWasherMode
-
-namespace RefrigeratorAndTemperatureControlledCabinetMode {
-namespace Attributes {
+} // namespace Description
 
-namespace ClusterRevision {
+namespace StandardNamespace {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+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::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, readable, sizeof(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))
+    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, uint16_t value)
 {
     using Traits = NumericAttributeTraits<uint16_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::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, writable,
-                                 ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace RefrigeratorAndTemperatureControlledCabinetMode
-
-namespace LaundryWasherControls {
-namespace Attributes {
+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);
+}
 
-namespace SpinSpeedCurrent {
+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 +7148,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 +7157,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 +7170,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 +7232,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 +7251,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 +7263,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 +7282,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 +7300,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,15 +7319,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::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 RvcCleanMode {
+namespace RefrigeratorAndTemperatureControlledCabinetMode {
 namespace Attributes {
 
 namespace ClusterRevision {
@@ -7167,8 +7336,9 @@ 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::RvcCleanMode::Id, Id, readable, sizeof(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))
     {
@@ -7187,56 +7357,79 @@ 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::RvcCleanMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, writable,
+                                 ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace RvcCleanMode
+} // namespace RefrigeratorAndTemperatureControlledCabinetMode
 
-namespace TemperatureControl {
+namespace LaundryWasherControls {
 namespace Attributes {
 
-namespace TemperatureSetpoint {
+namespace SpinSpeedCurrent {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<uint8_t> & value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::TemperatureControl::Id, Id, readable, sizeof(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))
+    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, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
-    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::TemperatureControl::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
-} // namespace TemperatureSetpoint
+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);
+}
 
-namespace MinTemperature {
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<uint8_t> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+    return Set(endpoint, value.Value());
+}
+
+} // namespace SpinSpeedCurrent
+
+namespace NumberOfRinses {
+
+EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::TemperatureControl::Id, Id, readable, sizeof(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))
     {
@@ -7245,9 +7438,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::LaundryWasherControls::NumberOfRinsesEnum>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -7255,19 +7448,19 @@ 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::TemperatureControl::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_ENUM8_ATTRIBUTE_TYPE);
 }
 
-} // namespace MinTemperature
+} // namespace NumberOfRinses
 
-namespace MaxTemperature {
+namespace FeatureMap {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::TemperatureControl::Id, Id, readable, sizeof(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))
     {
@@ -7276,9 +7469,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -7286,19 +7479,19 @@ 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::TemperatureControl::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-} // namespace MaxTemperature
+} // namespace FeatureMap
 
-namespace Step {
+namespace ClusterRevision {
 
-EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::TemperatureControl::Id, Id, readable, sizeof(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))
     {
@@ -7307,9 +7500,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, int16_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<int16_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -7317,19 +7510,25 @@ 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::TemperatureControl::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherControls::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace Step
+} // namespace ClusterRevision
 
-namespace SelectedTemperatureLevel {
+} // namespace Attributes
+} // namespace LaundryWasherControls
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+namespace RvcRunMode {
+namespace Attributes {
+
+namespace ClusterRevision {
+
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::TemperatureControl::Id, Id, readable, sizeof(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))
     {
@@ -7338,9 +7537,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, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -7348,10 +7547,208 @@ 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::TemperatureControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::RvcRunMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace SelectedTemperatureLevel
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace RvcRunMode
+
+namespace RvcCleanMode {
+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::RvcCleanMode::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::RvcCleanMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+}
+
+} // namespace ClusterRevision
+
+} // namespace Attributes
+} // namespace RvcCleanMode
+
+namespace TemperatureControl {
+namespace Attributes {
+
+namespace TemperatureSetpoint {
+
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::TemperatureControl::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, int16_t value)
+{
+    using Traits = NumericAttributeTraits<int16_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::TemperatureControl::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
+}
+
+} // namespace TemperatureSetpoint
+
+namespace MinTemperature {
+
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::TemperatureControl::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, int16_t value)
+{
+    using Traits = NumericAttributeTraits<int16_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::TemperatureControl::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
+}
+
+} // namespace MinTemperature
+
+namespace MaxTemperature {
+
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::TemperatureControl::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, int16_t value)
+{
+    using Traits = NumericAttributeTraits<int16_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::TemperatureControl::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
+}
+
+} // namespace MaxTemperature
+
+namespace Step {
+
+EmberAfStatus Get(chip::EndpointId endpoint, int16_t * value)
+{
+    using Traits = NumericAttributeTraits<int16_t>;
+    Traits::StorageType temp;
+    uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::TemperatureControl::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, int16_t value)
+{
+    using Traits = NumericAttributeTraits<int16_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::TemperatureControl::Id, Id, writable, ZCL_TEMPERATURE_ATTRIBUTE_TYPE);
+}
+
+} // namespace Step
+
+namespace SelectedTemperatureLevel {
+
+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::TemperatureControl::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::TemperatureControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+}
+
+} // namespace SelectedTemperatureLevel
 
 namespace FeatureMap {
 
@@ -8385,47 +8782,1074 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value)
     return emberAfWriteAttribute(endpoint, Clusters::MicrowaveOvenControl::Id, Id, writable, ZCL_ELAPSED_S_ATTRIBUTE_TYPE);
 }
 
-} // namespace CookTime
+} // 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 PowerSetting {
+namespace OpenLevel {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::Percent> & value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<chip::Percent>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::MicrowaveOvenControl::Id, Id, readable, sizeof(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))
+    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, uint8_t value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::Percent value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
-    if (!Traits::CanRepresentValue(/* isNullable = */ false, 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::MicrowaveOvenControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_PERCENT_ATTRIBUTE_TYPE);
 }
 
-} // namespace PowerSetting
+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);
+}
 
-namespace MinPower {
+EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable<chip::Percent> & value)
+{
+    if (value.IsNull())
+    {
+        return SetNull(endpoint);
+    }
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+    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<uint8_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::MicrowaveOvenControl::Id, Id, readable, sizeof(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))
     {
@@ -8434,9 +9858,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::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap> value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -8444,19 +9869,19 @@ 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::MicrowaveOvenControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE);
 }
 
-} // namespace MinPower
+} // namespace ValveFault
 
-namespace MaxPower {
+namespace FeatureMap {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    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));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -8465,9 +9890,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, uint32_t value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<uint32_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -8475,19 +9900,19 @@ 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::MicrowaveOvenControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-} // namespace MaxPower
+} // namespace FeatureMap
 
-namespace PowerStep {
+namespace ClusterRevision {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    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));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -8496,9 +9921,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, uint16_t value)
 {
-    using Traits = NumericAttributeTraits<uint8_t>;
+    using Traits = NumericAttributeTraits<uint16_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -8506,19 +9931,26 @@ 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::MicrowaveOvenControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::ValveConfigurationAndControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
-} // namespace PowerStep
+} // namespace ClusterRevision
 
-namespace FeatureMap {
+} // namespace Attributes
+} // namespace ValveConfigurationAndControl
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+namespace DemandResponseLoadControl {
+namespace Attributes {
+
+namespace DeviceClass {
+
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::DemandResponseLoadControl::DeviceClassBitmap> * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::DemandResponseLoadControl::DeviceClassBitmap>>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
-    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::MicrowaveOvenControl::Id, Id, readable, sizeof(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))
     {
@@ -8527,9 +9959,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::DemandResponseLoadControl::DeviceClassBitmap> value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<chip::BitMask<chip::app::Clusters::DemandResponseLoadControl::DeviceClassBitmap>>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -8537,19 +9969,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::MicrowaveOvenControl::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-} // namespace FeatureMap
+} // namespace DeviceClass
 
-namespace ClusterRevision {
+namespace NumberOfLoadControlPrograms {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    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));
+    EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -8558,9 +9990,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, uint8_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -8568,25 +10000,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::MicrowaveOvenControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace MicrowaveOvenControl
-
-namespace OperationalState {
-namespace Attributes {
+} // namespace NumberOfLoadControlPrograms
 
-namespace FeatureMap {
+namespace NumberOfEventsPerProgram {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint8_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::DemandResponseLoadControl::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -8595,9 +10021,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, uint8_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -8605,19 +10031,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::OperationalState::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
+    return emberAfWriteAttribute(endpoint, Clusters::DemandResponseLoadControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
-} // namespace FeatureMap
+} // namespace NumberOfEventsPerProgram
 
-namespace ClusterRevision {
+namespace NumberOfTransistions {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint8_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::DemandResponseLoadControl::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -8626,9 +10052,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, uint8_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -8636,25 +10062,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::DemandResponseLoadControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace OperationalState
-
-namespace RvcOperationalState {
-namespace Attributes {
+} // namespace NumberOfTransistions
 
-namespace FeatureMap {
+namespace DefaultRandomStart {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint8_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::DemandResponseLoadControl::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -8663,9 +10083,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, uint8_t value)
 {
-    using Traits = NumericAttributeTraits<uint32_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -8673,19 +10093,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::DemandResponseLoadControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
-} // namespace FeatureMap
+} // namespace DefaultRandomStart
 
-namespace ClusterRevision {
+namespace DefaultRandomDuration {
 
-EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value)
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint8_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::DemandResponseLoadControl::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -8694,9 +10114,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, uint8_t value)
 {
-    using Traits = NumericAttributeTraits<uint16_t>;
+    using Traits = NumericAttributeTraits<uint8_t>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -8704,25 +10124,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::DemandResponseLoadControl::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace RvcOperationalState
-
-namespace HepaFilterMonitoring {
-namespace Attributes {
+} // namespace DefaultRandomDuration
 
-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::DemandResponseLoadControl::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -8731,9 +10145,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;
@@ -8741,16 +10155,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::DemandResponseLoadControl::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE);
 }
 
-} // namespace ClusterRevision
-
-} // namespace Attributes
-} // namespace HepaFilterMonitoring
-
-namespace ActivatedCarbonFilterMonitoring {
-namespace Attributes {
+} // namespace FeatureMap
 
 namespace ClusterRevision {
 
@@ -8758,9 +10166,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::DemandResponseLoadControl::Id, Id, readable, sizeof(temp));
     VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status);
     if (!Traits::CanRepresentValue(/* isNullable = */ false, temp))
     {
@@ -8779,13 +10186,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::DemandResponseLoadControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE);
 }
 
 } // namespace ClusterRevision
 
 } // namespace Attributes
-} // namespace ActivatedCarbonFilterMonitoring
+} // namespace DemandResponseLoadControl
 
 namespace DoorLock {
 namespace Attributes {
@@ -14818,9 +16225,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 =
@@ -14833,9 +16241,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;
@@ -14851,9 +16260,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 =
@@ -14866,9 +16275,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;
@@ -14884,9 +16293,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 =
@@ -14899,9 +16310,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;
@@ -19912,7 +21325,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);
@@ -19921,16 +21334,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());
@@ -19939,6 +21352,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)
@@ -20753,9 +22197,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));
@@ -20767,9 +22211,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 974b3a11eebe76..309f3eaaea650a 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);
@@ -243,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 {
@@ -1282,6 +1287,72 @@ 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 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 ModeSelect {
 namespace Attributes {
 
@@ -1720,6 +1791,183 @@ 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 DeviceClass {
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::DemandResponseLoadControl::DeviceClassBitmap> * value); // DeviceClassBitmap
+EmberAfStatus Set(chip::EndpointId endpoint,
+                  chip::BitMask<chip::app::Clusters::DemandResponseLoadControl::DeviceClassBitmap> value);
+} // namespace DeviceClass
+
+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 NumberOfTransistions {
+EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u
+EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
+} // namespace NumberOfTransistions
+
+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 DoorLock {
 namespace Attributes {
 
@@ -2681,18 +2929,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 {
@@ -3553,6 +3808,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);
@@ -3714,8 +3974,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 d12f0158e0e8a3..fab93d0eaba421 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,22 @@ 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 Mode Cluster Init
+ *
+ * Cluster Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfOvenModeClusterInitCallback(chip::EndpointId endpoint);
+
 /** @brief Mode Select Cluster Init
  *
  * Cluster Init
@@ -505,6 +521,30 @@ 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 Door Lock Cluster Init
  *
  * Cluster Init
@@ -3994,6 +4034,162 @@ void emberAfIcdManagementClusterServerTickCallback(chip::EndpointId endpoint);
  */
 void emberAfIcdManagementClusterClientTickCallback(chip::EndpointId endpoint);
 
+//
+// Timer Cluster
+//
+
+/** @brief Timer Cluster Server Init
+ *
+ * Server Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfTimerClusterServerInitCallback(chip::EndpointId endpoint);
+
+/** @brief Timer Cluster Server Shutdown
+ *
+ * Server Shutdown
+ *
+ * @param endpoint    Endpoint that is being shutdown
+ */
+void MatterTimerClusterServerShutdownCallback(chip::EndpointId endpoint);
+
+/** @brief Timer Cluster Client Init
+ *
+ * Client Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfTimerClusterClientInitCallback(chip::EndpointId endpoint);
+
+/** @brief Timer Cluster Server Attribute Changed
+ *
+ * Server Attribute Changed
+ *
+ * @param attributePath Concrete attribute path that changed
+ */
+void MatterTimerClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+
+/** @brief Timer 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
+MatterTimerClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                    EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Timer 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
+MatterTimerClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                    EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Timer Cluster Server Tick
+ *
+ * Server Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfTimerClusterServerTickCallback(chip::EndpointId endpoint);
+
+/** @brief Timer Cluster Client Tick
+ *
+ * Client Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfTimerClusterClientTickCallback(chip::EndpointId endpoint);
+
+//
+// Oven Mode Cluster
+//
+
+/** @brief Oven Mode Cluster Server Init
+ *
+ * Server Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfOvenModeClusterServerInitCallback(chip::EndpointId endpoint);
+
+/** @brief Oven Mode Cluster Server Shutdown
+ *
+ * Server Shutdown
+ *
+ * @param endpoint    Endpoint that is being shutdown
+ */
+void MatterOvenModeClusterServerShutdownCallback(chip::EndpointId endpoint);
+
+/** @brief Oven Mode Cluster Client Init
+ *
+ * Client Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfOvenModeClusterClientInitCallback(chip::EndpointId endpoint);
+
+/** @brief Oven Mode Cluster Server Attribute Changed
+ *
+ * Server Attribute Changed
+ *
+ * @param attributePath Concrete attribute path that changed
+ */
+void MatterOvenModeClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+
+/** @brief Oven 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
+MatterOvenModeClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                       EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Oven 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
+MatterOvenModeClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath,
+                                                       EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Oven Mode Cluster Server Tick
+ *
+ * Server Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfOvenModeClusterServerTickCallback(chip::EndpointId endpoint);
+
+/** @brief Oven Mode Cluster Client Tick
+ *
+ * Client Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfOvenModeClusterClientTickCallback(chip::EndpointId endpoint);
+
 //
 // Mode Select Cluster
 //
@@ -5388,6 +5584,235 @@ void emberAfActivatedCarbonFilterMonitoringClusterServerTickCallback(chip::Endpo
  */
 void emberAfActivatedCarbonFilterMonitoringClusterClientTickCallback(chip::EndpointId endpoint);
 
+//
+// Boolean Sensor Configuration Cluster
+//
+
+/** @brief Boolean Sensor Configuration Cluster Server Init
+ *
+ * Server Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfBooleanSensorConfigurationClusterServerInitCallback(chip::EndpointId endpoint);
+
+/** @brief Boolean Sensor Configuration Cluster Server Shutdown
+ *
+ * Server Shutdown
+ *
+ * @param endpoint    Endpoint that is being shutdown
+ */
+void MatterBooleanSensorConfigurationClusterServerShutdownCallback(chip::EndpointId endpoint);
+
+/** @brief Boolean Sensor Configuration Cluster Client Init
+ *
+ * Client Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfBooleanSensorConfigurationClusterClientInitCallback(chip::EndpointId endpoint);
+
+/** @brief Boolean Sensor Configuration Cluster Server Attribute Changed
+ *
+ * Server Attribute Changed
+ *
+ * @param attributePath Concrete attribute path that changed
+ */
+void MatterBooleanSensorConfigurationClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+
+/** @brief Boolean Sensor Configuration 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 MatterBooleanSensorConfigurationClusterServerPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Boolean Sensor Configuration 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 MatterBooleanSensorConfigurationClusterClientPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Boolean Sensor Configuration Cluster Server Tick
+ *
+ * Server Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfBooleanSensorConfigurationClusterServerTickCallback(chip::EndpointId endpoint);
+
+/** @brief Boolean Sensor Configuration Cluster Client Tick
+ *
+ * Client Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfBooleanSensorConfigurationClusterClientTickCallback(chip::EndpointId endpoint);
+
+//
+// Valve Configuration and Control Cluster
+//
+
+/** @brief Valve Configuration and Control Cluster Server Init
+ *
+ * Server Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfValveConfigurationAndControlClusterServerInitCallback(chip::EndpointId endpoint);
+
+/** @brief Valve Configuration and Control Cluster Server Shutdown
+ *
+ * Server Shutdown
+ *
+ * @param endpoint    Endpoint that is being shutdown
+ */
+void MatterValveConfigurationAndControlClusterServerShutdownCallback(chip::EndpointId endpoint);
+
+/** @brief Valve Configuration and Control Cluster Client Init
+ *
+ * Client Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfValveConfigurationAndControlClusterClientInitCallback(chip::EndpointId endpoint);
+
+/** @brief Valve Configuration and Control Cluster Server Attribute Changed
+ *
+ * Server Attribute Changed
+ *
+ * @param attributePath Concrete attribute path that changed
+ */
+void MatterValveConfigurationAndControlClusterServerAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath);
+
+/** @brief Valve Configuration and 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 MatterValveConfigurationAndControlClusterServerPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Valve Configuration and 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 MatterValveConfigurationAndControlClusterClientPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Valve Configuration and Control Cluster Server Tick
+ *
+ * Server Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfValveConfigurationAndControlClusterServerTickCallback(chip::EndpointId endpoint);
+
+/** @brief Valve Configuration and Control Cluster Client Tick
+ *
+ * Client Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfValveConfigurationAndControlClusterClientTickCallback(chip::EndpointId endpoint);
+
+//
+// Demand Response Load Control Cluster
+//
+
+/** @brief Demand Response Load Control Cluster Server Init
+ *
+ * Server Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfDemandResponseLoadControlClusterServerInitCallback(chip::EndpointId endpoint);
+
+/** @brief Demand Response Load Control Cluster Server Shutdown
+ *
+ * Server Shutdown
+ *
+ * @param endpoint    Endpoint that is being shutdown
+ */
+void MatterDemandResponseLoadControlClusterServerShutdownCallback(chip::EndpointId endpoint);
+
+/** @brief Demand Response Load Control Cluster Client Init
+ *
+ * Client Init
+ *
+ * @param endpoint    Endpoint that is being initialized
+ */
+void emberAfDemandResponseLoadControlClusterClientInitCallback(chip::EndpointId endpoint);
+
+/** @brief Demand Response Load Control Cluster Server Attribute Changed
+ *
+ * Server Attribute Changed
+ *
+ * @param attributePath Concrete attribute path that changed
+ */
+void MatterDemandResponseLoadControlClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
+
+/** @brief Demand Response Load 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 MatterDemandResponseLoadControlClusterServerPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Demand Response Load 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 MatterDemandResponseLoadControlClusterClientPreAttributeChangedCallback(
+    const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
+
+/** @brief Demand Response Load Control Cluster Server Tick
+ *
+ * Server Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfDemandResponseLoadControlClusterServerTickCallback(chip::EndpointId endpoint);
+
+/** @brief Demand Response Load Control Cluster Client Tick
+ *
+ * Client Tick
+ *
+ * @param endpoint  Endpoint that is being served
+ */
+void emberAfDemandResponseLoadControlClusterClientTickCallback(chip::EndpointId endpoint);
+
 //
 // Door Lock Cluster
 //
@@ -8997,6 +9422,34 @@ 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 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)
  */
@@ -9039,6 +9492,61 @@ bool emberAfMicrowaveOvenControlClusterSetCookingParametersCallback(
 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 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 4e3c6d09cef847..4b287c6e70abc8 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,41 @@ 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(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(LaundryWasherControls::NumberOfRinsesEnum val)
 {
     using EnumType = LaundryWasherControls::NumberOfRinsesEnum;
@@ -1456,6 +1462,115 @@ 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(DemandResponseLoadControl::PowerSavingsEnum val)
+{
+    using EnumType = DemandResponseLoadControl::PowerSavingsEnum;
+    switch (val)
+    {
+    case EnumType::kLow:
+    case EnumType::kMedium:
+    case EnumType::kHigh:
+        return val;
+    default:
+        return static_cast<EnumType>(3);
+    }
+}
+
 static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::AlarmCodeEnum val)
 {
     using EnumType = DoorLock::AlarmCodeEnum;
@@ -1999,6 +2114,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;
@@ -2635,9 +2792,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(Channel::StatusEnum val
     }
 }
 
-static auto __attribute__((unused)) EnsureKnownEnumValue(TargetNavigator::TargetNavigatorStatusEnum val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(TargetNavigator::StatusEnum val)
 {
-    using EnumType = TargetNavigator::TargetNavigatorStatusEnum;
+    using EnumType = TargetNavigator::StatusEnum;
     switch (val)
     {
     case EnumType::kSuccess:
@@ -2799,9 +2956,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:
@@ -2813,19 +2970,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;
@@ -2862,6 +3006,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)
 {
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 28cff087bcc9f1..7712c63d297961 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
@@ -182,11 +182,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,
@@ -196,16 +193,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,
@@ -215,10 +205,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
@@ -228,8 +214,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,
@@ -922,6 +908,7 @@ enum class Feature : uint32_t
     kWiFiNetworkInterface     = 0x1,
     kThreadNetworkInterface   = 0x2,
     kEthernetNetworkInterface = 0x4,
+    kPerDeviceCredentials     = 0x8,
 };
 
 // Bitmap for ThreadCapabilitiesBitmap
@@ -937,11 +924,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
 
@@ -1210,9 +1198,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
 {
@@ -1232,10 +1217,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
@@ -1522,6 +1503,57 @@ 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 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 ModeSelect {
 
 // Bitmap for Feature
@@ -2045,6 +2077,205 @@ 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,
+};
+
+// Enum for PowerSavingsEnum
+enum class PowerSavingsEnum : uint8_t
+{
+    kLow    = 0x00,
+    kMedium = 0x01,
+    kHigh   = 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 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 DoorLock {
 
 // Enum for AlarmCodeEnum
@@ -2927,7 +3158,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 {
 
@@ -3785,8 +4057,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,
@@ -3970,8 +4242,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,
@@ -3994,19 +4266,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
 {
@@ -4043,6 +4302,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
 {
@@ -4050,8 +4322,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,
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 0aeb0447d75785..5a39feaae41d35 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 {
@@ -10519,15 +10723,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();
 }
 
@@ -10545,13 +10748,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
         {
@@ -10560,16 +10759,32 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
+} // namespace SetTimer.
+namespace ResetTimer {
+CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
+{
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    return encoder.Finalize();
+}
 
-} // namespace SemanticTagStruct
-
-namespace ModeOptionStruct {
+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 ResetTimer.
+namespace AddTime {
 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);
+    encoder.Encode(to_underlying(Fields::kAdditionalTime), additionalTime);
     return encoder.Finalize();
 }
 
@@ -10587,17 +10802,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::kLabel))
-        {
-            err = DataModel::Decode(reader, label);
-        }
-        else if (__context_tag == to_underlying(Fields::kMode))
-        {
-            err = DataModel::Decode(reader, mode);
-        }
-        else if (__context_tag == to_underlying(Fields::kSemanticTags))
+        if (__context_tag == to_underlying(Fields::kAdditionalTime))
         {
-            err = DataModel::Decode(reader, semanticTags);
+            err = DataModel::Decode(reader, additionalTime);
         }
         else
         {
@@ -10606,16 +10813,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();
 }
 
@@ -10633,9 +10836,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
         {
@@ -10644,7 +10847,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace ChangeToMode.
+} // namespace ReduceTime.
 } // namespace Commands
 
 namespace Attributes {
@@ -10652,18 +10855,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():
@@ -10684,8 +10881,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 
 namespace Events {} // namespace Events
 
-} // namespace ModeSelect
-namespace LaundryWasherMode {
+} // namespace Timer
+namespace OvenMode {
 namespace Structs {} // namespace Structs
 
 namespace Commands {
@@ -10797,16 +10994,16 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 
 namespace Events {} // namespace Events
 
-} // namespace LaundryWasherMode
-namespace RefrigeratorAndTemperatureControlledCabinetMode {
-namespace Structs {} // namespace Structs
+} // namespace OvenMode
+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();
 }
 
@@ -10824,9 +11021,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
         {
@@ -10835,13 +11036,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();
 }
 
@@ -10859,22 +11063,64 @@ 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
+        else if (__context_tag == to_underlying(Fields::kSemanticTags))
+        {
+            err = DataModel::Decode(reader, semanticTags);
+        }
+        else
         {
         }
 
         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 {
@@ -10882,6 +11128,10 @@ 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():
@@ -10910,46 +11160,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 
 namespace Events {} // namespace Events
 
-} // namespace RefrigeratorAndTemperatureControlledCabinetMode
-namespace LaundryWasherControls {
-
-namespace Commands {} // namespace Commands
-
-namespace Attributes {
-CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path)
-{
-    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::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 LaundryWasherControls
-namespace RvcRunMode {
+} // namespace ModeSelect
+namespace LaundryWasherMode {
 namespace Structs {} // namespace Structs
 
 namespace Commands {
@@ -11037,6 +11249,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():
@@ -11059,8 +11273,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 
 namespace Events {} // namespace Events
 
-} // namespace RvcRunMode
-namespace RvcCleanMode {
+} // namespace LaundryWasherMode
+namespace RefrigeratorAndTemperatureControlledCabinetMode {
 namespace Structs {} // namespace Structs
 
 namespace Commands {
@@ -11148,6 +11362,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():
@@ -11170,90 +11386,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 
 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 RefrigeratorAndTemperatureControlledCabinetMode
+namespace LaundryWasherControls {
 
 namespace Commands {} // namespace Commands
 
@@ -11262,12 +11396,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():
@@ -11286,61 +11422,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 {
@@ -11428,8 +11513,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():
@@ -11452,18 +11535,97 @@ 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();
+}
+
+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::AirQuality::TypeInfo::GetAttributeId():
-        return DataModel::Decode(reader, airQuality);
+    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():
@@ -11484,14 +11646,16 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 
 namespace Events {} // namespace Events
 
-} // namespace AirQuality
-namespace SmokeCoAlarm {
+} // namespace RvcCleanMode
+namespace TemperatureControl {
 
 namespace Commands {
-namespace SelfTestRequest {
+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();
 }
 
@@ -11505,9 +11669,26 @@ 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::kTargetTemperature))
+        {
+            err = DataModel::Decode(reader, targetTemperature);
+        }
+        else if (__context_tag == to_underlying(Fields::kTargetTemperatureLevel))
+        {
+            err = DataModel::Decode(reader, targetTemperatureLevel);
+        }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
     }
 }
-} // namespace SelfTestRequest.
+} // namespace SetTemperature.
 } // namespace Commands
 
 namespace Attributes {
@@ -11515,32 +11696,54 @@ 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::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():
@@ -11560,12 +11763,15 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 } // namespace Attributes
 
 namespace Events {
-namespace SmokeAlarm {
+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::kAlarmSeverityLevel), alarmSeverityLevel));
+    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);
 }
 
@@ -11583,9 +11789,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::kAlarmSeverityLevel))
+        if (__context_tag == to_underlying(Fields::kActive))
         {
-            err = DataModel::Decode(reader, alarmSeverityLevel);
+            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
         {
@@ -11594,14 +11812,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace SmokeAlarm.
-namespace COAlarm {
+} // 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
 {
-    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::kNewMode), newMode);
+    return encoder.Finalize();
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -11618,9 +11842,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::kNewMode))
         {
-            err = DataModel::Decode(reader, alarmSeverityLevel);
+            err = DataModel::Decode(reader, newMode);
         }
         else
         {
@@ -11629,14 +11853,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace COAlarm.
-namespace LowBattery {
+} // namespace ChangeToMode.
+namespace ChangeToModeResponse {
 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::kStatus), status);
+    encoder.Encode(to_underlying(Fields::kStatusText), statusText);
+    return encoder.Finalize();
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -11653,9 +11877,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::kStatus))
         {
-            err = DataModel::Decode(reader, alarmSeverityLevel);
+            err = DataModel::Decode(reader, status);
+        }
+        else if (__context_tag == to_underlying(Fields::kStatusText))
+        {
+            err = DataModel::Decode(reader, statusText);
         }
         else
         {
@@ -11664,7 +11892,255 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace LowBattery.
+} // 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
 {
@@ -11779,39 +12255,997 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
     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);
+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);
+    case Attributes::ClusterRevision::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, clusterRevision);
+    default:
+        return CHIP_NO_ERROR;
+    }
+}
+} // namespace Attributes
+
+namespace Events {} // namespace Events
 
-        if (__context_tag == to_underlying(Fields::kAlarmSeverityLevel))
-        {
-            err = DataModel::Decode(reader, alarmSeverityLevel);
-        }
-        else
-        {
-        }
+} // namespace HepaFilterMonitoring
+namespace ActivatedCarbonFilterMonitoring {
+namespace Structs {
 
-        ReturnErrorOnFailure(err);
-    }
-}
-} // namespace InterconnectSmokeAlarm.
-namespace InterconnectCOAlarm {
+namespace ReplacementProductStruct {
 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::kProductIdentifierType), productIdentifierType);
+    encoder.Encode(to_underlying(Fields::kProductIdentifierValue), productIdentifierValue);
+    return encoder.Finalize();
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -11828,9 +13262,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::kProductIdentifierType))
         {
-            err = DataModel::Decode(reader, alarmSeverityLevel);
+            err = DataModel::Decode(reader, productIdentifierType);
+        }
+        else if (__context_tag == to_underlying(Fields::kProductIdentifierValue))
+        {
+            err = DataModel::Decode(reader, productIdentifierValue);
         }
         else
         {
@@ -11839,39 +13277,15 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         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 ReplacementProductStruct
+} // namespace Structs
 
 namespace Commands {
-namespace Reset {
+namespace ResetCondition {
 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();
 }
 
@@ -11885,27 +13299,57 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             return std::get<CHIP_ERROR>(__element);
         }
+    }
+}
+} // namespace ResetCondition.
+} // namespace Commands
 
-        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 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 Reset.
-namespace ModifyEnabledAlarms {
+} // namespace Attributes
+
+namespace Events {} // namespace Events
+
+} // namespace ActivatedCarbonFilterMonitoring
+namespace BooleanSensorConfiguration {
+
+namespace Commands {
+namespace SuppressRequest {
 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::kAlarmsToSuppress), alarmsToSuppress);
     return encoder.Finalize();
 }
 
@@ -11923,9 +13367,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::kMask))
+        if (__context_tag == to_underlying(Fields::kAlarmsToSuppress))
         {
-            err = DataModel::Decode(reader, mask);
+            err = DataModel::Decode(reader, alarmsToSuppress);
         }
         else
         {
@@ -11934,7 +13378,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace ModifyEnabledAlarms.
+} // namespace SuppressRequest.
 } // namespace Commands
 
 namespace Attributes {
@@ -11942,14 +13386,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::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::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():
@@ -11969,15 +13413,13 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 } // namespace Attributes
 
 namespace Events {
-namespace Notify {
+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::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));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kAlarmsActive), alarmsActive));
+    ReturnErrorOnFailure(DataModel::Encode(aWriter, TLV::ContextTag(Fields::kAlarmsSuppressed), alarmsSuppressed));
     return aWriter.EndContainer(outer);
 }
 
@@ -11995,21 +13437,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::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))
+        if (__context_tag == to_underlying(Fields::kAlarmsActive))
         {
-            err = DataModel::Decode(reader, state);
+            err = DataModel::Decode(reader, alarmsActive);
         }
-        else if (__context_tag == to_underlying(Fields::kMask))
+        else if (__context_tag == to_underlying(Fields::kAlarmsSuppressed))
         {
-            err = DataModel::Decode(reader, mask);
+            err = DataModel::Decode(reader, alarmsSuppressed);
         }
         else
         {
@@ -12018,55 +13452,39 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace Notify.
-} // namespace Events
-
-} // namespace DishwasherAlarm
-namespace MicrowaveOvenMode {
-namespace Structs {} // namespace Structs
-
-namespace Commands {} // namespace Commands
+} // 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));
+    return aWriter.EndContainer(outer);
+}
 
-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::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;
+        auto __element = __iterator.Next();
+        if (std::holds_alternative<CHIP_ERROR>(__element))
+        {
+            return std::get<CHIP_ERROR>(__element);
+        }
     }
 }
-} // namespace Attributes
-
-namespace Events {} // namespace Events
+} // namespace SensorFault.
+} // namespace Events
 
-} // namespace MicrowaveOvenMode
-namespace MicrowaveOvenControl {
+} // namespace BooleanSensorConfiguration
+namespace ValveConfigurationAndControl {
 
 namespace Commands {
-namespace SetCookingParameters {
+namespace Open {
 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);
+    encoder.Encode(to_underlying(Fields::kOpenDuration), openDuration);
     return encoder.Finalize();
 }
 
@@ -12084,17 +13502,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::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))
+        if (__context_tag == to_underlying(Fields::kOpenDuration))
         {
-            err = DataModel::Decode(reader, powerSetting);
+            err = DataModel::Decode(reader, openDuration);
         }
         else
         {
@@ -12103,12 +13513,33 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace SetCookingParameters.
-namespace AddMoreTime {
+} // namespace Open.
+namespace Close {
 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);
+        }
+    }
+}
+} // 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();
 }
 
@@ -12126,9 +13557,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::kTimeToAdd))
+        if (__context_tag == to_underlying(Fields::kLevel))
         {
-            err = DataModel::Decode(reader, timeToAdd);
+            err = DataModel::Decode(reader, level);
+        }
+        else if (__context_tag == to_underlying(Fields::kOpenDuration))
+        {
+            err = DataModel::Decode(reader, openDuration);
         }
         else
         {
@@ -12137,7 +13572,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace AddMoreTime.
+} // namespace SetLevel.
 } // namespace Commands
 
 namespace Attributes {
@@ -12145,16 +13580,26 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     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::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():
@@ -12173,18 +13618,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 }
 } // namespace Attributes
 
-namespace Events {} // namespace Events
-
-} // namespace MicrowaveOvenControl
-namespace OperationalState {
-namespace Structs {} // namespace Structs
-
-namespace Commands {
-namespace Pause {
+namespace Events {
+namespace ValveStateChanged {
 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::kValveState), valveState));
+    return aWriter.EndContainer(outer);
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -12197,14 +13638,29 @@ 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 Pause.
-namespace Stop {
+} // namespace ValveStateChanged.
+namespace ValveFault {
 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::kValveFault), valveFault));
+    return aWriter.EndContainer(outer);
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -12217,13 +13673,33 @@ 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 Stop.
-namespace Start {
+} // namespace ValveFault.
+} // namespace Events
+
+} // namespace ValveConfigurationAndControl
+namespace DemandResponseLoadControl {
+namespace Structs {
+
+namespace HeatingSourceControlStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kHeatingSource), heatingSource);
     return encoder.Finalize();
 }
 
@@ -12237,13 +13713,29 @@ 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 Start.
-namespace Resume {
+
+} // namespace HeatingSourceControlStruct
+
+namespace PowerSavingsControlStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kPowerSavings), powerSavings);
     return encoder.Finalize();
 }
 
@@ -12257,14 +13749,29 @@ 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 Resume.
-namespace OperationalCommandResponse {
+
+} // namespace PowerSavingsControlStruct
+
+namespace DutyCycleControlStruct {
 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::kDutyCycle), dutyCycle);
     return encoder.Finalize();
 }
 
@@ -12282,9 +13789,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::kCommandResponseState))
+        if (__context_tag == to_underlying(Fields::kDutyCycle))
         {
-            err = DataModel::Decode(reader, commandResponseState);
+            err = DataModel::Decode(reader, dutyCycle);
         }
         else
         {
@@ -12293,52 +13800,15 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         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 DutyCycleControlStruct
 
-namespace Events {
-namespace OperationalError {
+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::kErrorState), errorState));
-    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)
@@ -12355,9 +13825,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::kLoadAdjustment))
         {
-            err = DataModel::Decode(reader, errorState);
+            err = DataModel::Decode(reader, loadAdjustment);
         }
         else
         {
@@ -12366,16 +13836,18 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace OperationalError.
-namespace OperationCompletion {
+
+} // 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));
-    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::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)
@@ -12392,17 +13864,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::kCompletionErrorCode))
+        if (__context_tag == to_underlying(Fields::kCoolingTempOffset))
         {
-            err = DataModel::Decode(reader, completionErrorCode);
+            err = DataModel::Decode(reader, coolingTempOffset);
         }
-        else if (__context_tag == to_underlying(Fields::kTotalOperationalTime))
+        else if (__context_tag == to_underlying(Fields::kHeatingtTempOffset))
         {
-            err = DataModel::Decode(reader, totalOperationalTime);
+            err = DataModel::Decode(reader, heatingtTempOffset);
         }
-        else if (__context_tag == to_underlying(Fields::kPausedTime))
+        else if (__context_tag == to_underlying(Fields::kCoolingTempSetpoint))
         {
-            err = DataModel::Decode(reader, pausedTime);
+            err = DataModel::Decode(reader, coolingTempSetpoint);
+        }
+        else if (__context_tag == to_underlying(Fields::kHeatingTempSetpoint))
+        {
+            err = DataModel::Decode(reader, heatingTempSetpoint);
         }
         else
         {
@@ -12411,18 +13887,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace OperationCompletion.
-} // namespace Events
 
-} // namespace OperationalState
-namespace RvcOperationalState {
-namespace Structs {} // namespace Structs
+} // namespace TemperatureControlStruct
 
-namespace Commands {
-namespace Pause {
+namespace LoadControlEventTransitionStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    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();
 }
 
@@ -12436,13 +13914,60 @@ 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::kDuration))
+        {
+            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
+        {
+        }
+
+        ReturnErrorOnFailure(err);
     }
 }
-} // namespace Pause.
-namespace Stop {
+
+} // 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::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();
 }
 
@@ -12456,13 +13981,61 @@ 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::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
+        {
+        }
+
+        ReturnErrorOnFailure(err);
     }
 }
-} // namespace Stop.
-namespace Start {
+
+} // namespace LoadControlEventStruct
+
+namespace LoadControlProgramStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     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();
 }
 
@@ -12476,34 +14049,47 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         {
             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))
+        CHIP_ERROR err              = CHIP_NO_ERROR;
+        const uint8_t __context_tag = std::get<uint8_t>(__element);
+
+        if (__context_tag == to_underlying(Fields::kProgramID))
+        {
+            err = DataModel::Decode(reader, programID);
+        }
+        else if (__context_tag == to_underlying(Fields::kName))
         {
-            return std::get<CHIP_ERROR>(__element);
+            err = DataModel::Decode(reader, name);
+        }
+        else if (__context_tag == to_underlying(Fields::kEnrollmentGroup))
+        {
+            err = DataModel::Decode(reader, enrollmentGroup);
+        }
+        else if (__context_tag == to_underlying(Fields::kRandomStartMinutes))
+        {
+            err = DataModel::Decode(reader, randomStartMinutes);
+        }
+        else if (__context_tag == to_underlying(Fields::kRandomDurationMinutes))
+        {
+            err = DataModel::Decode(reader, randomDurationMinutes);
         }
+        else
+        {
+        }
+
+        ReturnErrorOnFailure(err);
     }
 }
-} // namespace Resume.
-namespace OperationalCommandResponse {
+
+} // namespace LoadControlProgramStruct
+} // namespace Structs
+
+namespace Commands {
+namespace RegisterLoadControlProgramRequest {
 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::kLoadControlProgram), loadControlProgram);
     return encoder.Finalize();
 }
 
@@ -12521,9 +14107,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::kCommandResponseState))
+        if (__context_tag == to_underlying(Fields::kLoadControlProgram))
         {
-            err = DataModel::Decode(reader, commandResponseState);
+            err = DataModel::Decode(reader, loadControlProgram);
         }
         else
         {
@@ -12532,52 +14118,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         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 {
+} // namespace RegisterLoadControlProgramRequest.
+namespace UnregisterLoadControlProgramRequest {
 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);
+    DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
+    encoder.Encode(to_underlying(Fields::kLoadControlProgramID), loadControlProgramID);
+    return encoder.Finalize();
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -12594,9 +14141,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::kLoadControlProgramID))
         {
-            err = DataModel::Decode(reader, errorState);
+            err = DataModel::Decode(reader, loadControlProgramID);
         }
         else
         {
@@ -12605,16 +14152,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace OperationalError.
-namespace OperationCompletion {
+} // namespace UnregisterLoadControlProgramRequest.
+namespace AddLoadControlEventRequest {
 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::kEvent), event);
+    return encoder.Finalize();
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -12631,17 +14175,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::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))
+        if (__context_tag == to_underlying(Fields::kEvent))
         {
-            err = DataModel::Decode(reader, pausedTime);
+            err = DataModel::Decode(reader, event);
         }
         else
         {
@@ -12650,19 +14186,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-} // namespace OperationCompletion.
-} // namespace Events
-
-} // namespace RvcOperationalState
-namespace HepaFilterMonitoring {
-namespace Structs {
-
-namespace ReplacementProductStruct {
+} // 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::kProductIdentifierType), productIdentifierType);
-    encoder.Encode(to_underlying(Fields::kProductIdentifierValue), productIdentifierValue);
+    encoder.Encode(to_underlying(Fields::kEventID), eventID);
+    encoder.Encode(to_underlying(Fields::kCancelControl), cancelControl);
     return encoder.Finalize();
 }
 
@@ -12680,13 +14210,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::kProductIdentifierType))
+        if (__context_tag == to_underlying(Fields::kEventID))
         {
-            err = DataModel::Decode(reader, productIdentifierType);
+            err = DataModel::Decode(reader, eventID);
         }
-        else if (__context_tag == to_underlying(Fields::kProductIdentifierValue))
+        else if (__context_tag == to_underlying(Fields::kCancelControl))
         {
-            err = DataModel::Decode(reader, productIdentifierValue);
+            err = DataModel::Decode(reader, cancelControl);
         }
         else
         {
@@ -12695,12 +14225,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         ReturnErrorOnFailure(err);
     }
 }
-
-} // namespace ReplacementProductStruct
-} // namespace Structs
-
-namespace Commands {
-namespace ResetCondition {
+} // namespace RemoveLoadControlEventRequest.
+namespace ClearLoadControlEventsRequest {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const
 {
     DataModel::WrappedStructEncoder encoder{ aWriter, aTag };
@@ -12719,7 +14245,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
     }
 }
-} // namespace ResetCondition.
+} // namespace ClearLoadControlEventsRequest.
 } // namespace Commands
 
 namespace Attributes {
@@ -12727,18 +14253,24 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 {
     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::DeviceClass::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, deviceClass);
+    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::NumberOfTransistions::TypeInfo::GetAttributeId():
+        return DataModel::Decode(reader, numberOfTransistions);
+    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():
@@ -12757,19 +14289,23 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre
 }
 } // namespace Attributes
 
-namespace Events {} // namespace Events
-
-} // namespace HepaFilterMonitoring
-namespace ActivatedCarbonFilterMonitoring {
-namespace Structs {
-
-namespace ReplacementProductStruct {
+namespace Events {
+namespace LoadControlEventStatusChange {
 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::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);
 }
 
 CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
@@ -12786,86 +14322,57 @@ 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::kEventID))
         {
-            err = DataModel::Decode(reader, productIdentifierType);
+            err = DataModel::Decode(reader, eventID);
         }
-        else if (__context_tag == to_underlying(Fields::kProductIdentifierValue))
+        else if (__context_tag == to_underlying(Fields::kTransitionIndex))
         {
-            err = DataModel::Decode(reader, productIdentifierValue);
+            err = DataModel::Decode(reader, transitionIndex);
         }
-        else
+        else if (__context_tag == to_underlying(Fields::kStatus))
         {
+            err = DataModel::Decode(reader, status);
         }
-
-        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))
+        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
         {
-            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;
+        ReturnErrorOnFailure(err);
     }
 }
-} // namespace Attributes
-
-namespace Events {} // namespace Events
+} // namespace LoadControlEventStatusChange.
+} // namespace Events
 
-} // namespace ActivatedCarbonFilterMonitoring
+} // namespace DemandResponseLoadControl
 namespace DoorLock {
 namespace Structs {
 
@@ -17717,6 +19224,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():
@@ -23059,6 +24568,20 @@ bool CommandIsFabricScoped(ClusterId aCluster, CommandId aCommand)
             return false;
         }
     }
+    case Clusters::Timer::Id: {
+        switch (aCommand)
+        {
+        default:
+            return false;
+        }
+    }
+    case Clusters::OvenMode::Id: {
+        switch (aCommand)
+        {
+        default:
+            return false;
+        }
+    }
     case Clusters::ModeSelect::Id: {
         switch (aCommand)
         {
@@ -23157,6 +24680,27 @@ 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::DoorLock::Id: {
         switch (aCommand)
         {
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 f88e598f1bccb0..70cb1a47187f9f 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
@@ -967,6 +967,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 {
@@ -1892,18 +1931,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
 {
@@ -1956,8 +1996,8 @@ struct TypeInfo
         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;
@@ -2471,8 +2511,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;
 
@@ -2489,8 +2529,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
@@ -2510,10 +2550,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;
 
@@ -2528,10 +2568,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
@@ -2552,11 +2592,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;
 
@@ -2571,11 +2611,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
@@ -2593,8 +2633,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;
 
@@ -2609,8 +2649,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
@@ -2632,8 +2672,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;
 
@@ -2650,8 +2690,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
@@ -2671,10 +2711,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;
 
@@ -2689,10 +2729,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
@@ -2713,11 +2753,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;
 
@@ -2732,11 +2772,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
@@ -2754,8 +2794,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;
 
@@ -2770,8 +2810,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
@@ -2898,9 +2938,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; }
@@ -3032,7 +3072,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;
@@ -5026,6 +5066,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
 {
@@ -5092,6 +5156,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;
@@ -7282,8 +7348,10 @@ namespace Structs {
 namespace NetworkInfoStruct {
 enum class Fields : uint8_t
 {
-    kNetworkID = 0,
-    kConnected = 1,
+    kNetworkID         = 0,
+    kConnected         = 1,
+    kNetworkIdentifier = 2,
+    kClientIdentifier  = 3,
 };
 
 struct Type
@@ -7291,6 +7359,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);
 
@@ -7418,6 +7488,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 {
@@ -7500,9 +7580,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
@@ -7515,6 +7598,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;
 
@@ -7532,6 +7618,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
@@ -7608,9 +7697,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
@@ -7623,6 +7714,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;
 
@@ -7640,6 +7733,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
@@ -7754,6 +7849,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 {
@@ -14266,91 +14431,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 ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
 
-using DecodableType = Type;
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::SetTimer::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
 
-} // namespace SemanticTagStruct
-namespace ModeOptionStruct {
+    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;
 
@@ -14362,126 +14576,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 {
+namespace SetTime {
 struct TypeInfo
 {
-    using Type             = chip::CharSpan;
-    using DecodableType    = chip::CharSpan;
-    using DecodableArgType = chip::CharSpan;
+    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::Description::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SetTime::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
-    static constexpr size_t MaxLength() { return 64; }
 };
-} // namespace Description
-namespace StandardNamespace {
+} // namespace SetTime
+namespace TimeRemaining {
 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> &;
+    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::StandardNamespace::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::TimeRemaining::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace StandardNamespace
-namespace SupportedModes {
+} // namespace TimeRemaining
+namespace TimerState {
 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> &;
+    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::SupportedModes::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::TimerState::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace SupportedModes
-namespace CurrentMode {
-struct TypeInfo
+} // namespace TimerState
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::Timer::Id; }
 };
-} // namespace CurrentMode
-namespace StartUpMode {
-struct TypeInfo
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::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
-{
-    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::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::ModeSelect::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
 
@@ -14489,16 +14664,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;
@@ -14508,8 +14680,8 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace ModeSelect
-namespace LaundryWasherMode {
+} // namespace Timer
+namespace OvenMode {
 namespace Structs {
 namespace ModeTagStruct    = Clusters::detail::Structs::ModeTagStruct;
 namespace ModeOptionStruct = Clusters::detail::Structs::ModeOptionStruct;
@@ -14542,13 +14714,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::LaundryWasherMode::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::LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType;
+    using ResponseType = Clusters::OvenMode::Commands::ChangeToModeResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -14557,7 +14729,7 @@ struct DecodableType
 {
 public:
     static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
 
     uint8_t newMode = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -14575,7 +14747,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::LaundryWasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
 
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
@@ -14591,7 +14763,7 @@ struct DecodableType
 {
 public:
     static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
 
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
@@ -14605,13 +14777,13 @@ namespace Attributes {
 namespace SupportedModes {
 struct TypeInfo
 {
-    using Type = chip::app::DataModel::List<const chip::app::Clusters::LaundryWasherMode::Structs::ModeOptionStruct::Type>;
+    using Type = chip::app::DataModel::List<const chip::app::Clusters::OvenMode::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> &;
+        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::LaundryWasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -14623,7 +14795,7 @@ struct TypeInfo
     using DecodableType    = uint8_t;
     using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -14635,7 +14807,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::LaundryWasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -14647,7 +14819,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::LaundryWasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -14655,37 +14827,37 @@ struct TypeInfo
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::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::LaundryWasherMode::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::LaundryWasherMode::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::LaundryWasherMode::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::LaundryWasherMode::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::LaundryWasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
 };
 } // namespace ClusterRevision
 
@@ -14693,7 +14865,7 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::OvenMode::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
@@ -14710,77 +14882,92 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace LaundryWasherMode
-namespace RefrigeratorAndTemperatureControlledCabinetMode {
+} // namespace OvenMode
+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::RefrigeratorAndTemperatureControlledCabinetMode::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::RefrigeratorAndTemperatureControlledCabinetMode::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::RefrigeratorAndTemperatureControlledCabinetMode::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::RefrigeratorAndTemperatureControlledCabinetMode::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;
 
@@ -14792,29 +14979,52 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::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::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::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::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -14826,7 +15036,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::ModeSelect::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -14838,7 +15048,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::ModeSelect::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -14850,7 +15060,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::ModeSelect::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -14858,37 +15068,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::ModeSelect::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::ModeSelect::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::ModeSelect::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::ModeSelect::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::ModeSelect::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::ModeSelect::Id; }
 };
 } // namespace ClusterRevision
 
@@ -14896,10 +15106,12 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::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;
@@ -14913,138 +15125,25 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace RefrigeratorAndTemperatureControlledCabinetMode
-namespace LaundryWasherControls {
+} // namespace ModeSelect
+namespace LaundryWasherMode {
+namespace Structs {
+namespace ModeTagStruct    = Clusters::detail::Structs::ModeTagStruct;
+namespace ModeOptionStruct = Clusters::detail::Structs::ModeOptionStruct;
+} // namespace Structs
 
-namespace Attributes {
+namespace Commands {
+// Forward-declarations so we can reference these later.
 
-namespace SpinSpeeds {
-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> &;
+namespace ChangeToMode {
+struct Type;
+struct DecodableType;
+} // namespace ChangeToMode
 
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SpinSpeeds::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace SpinSpeeds
-namespace SpinSpeedCurrent {
-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::LaundryWasherControls::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SpinSpeedCurrent::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace SpinSpeedCurrent
-namespace NumberOfRinses {
-struct 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; }
-};
-} // namespace GeneratedCommandList
-namespace AcceptedCommandList {
-struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
-{
-    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::LaundryWasherControls::Id; }
-};
-} // namespace EventList
-namespace AttributeList {
-struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
-{
-    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::LaundryWasherControls::Id; }
-};
-} // namespace FeatureMap
-namespace ClusterRevision {
-struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
-{
-    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
-};
-} // namespace ClusterRevision
-
-struct TypeInfo
-{
-    struct DecodableType
-    {
-        static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::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::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 LaundryWasherControls
-namespace RvcRunMode {
-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 ChangeToModeResponse {
+struct Type;
+struct DecodableType;
+} // namespace ChangeToModeResponse
 
 } // namespace Commands
 
@@ -15060,13 +15159,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::RvcRunMode::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::RvcRunMode::Commands::ChangeToModeResponse::DecodableType;
+    using ResponseType = Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -15075,7 +15174,7 @@ struct DecodableType
 {
 public:
     static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
 
     uint8_t newMode = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -15093,7 +15192,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::RvcRunMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
 
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
@@ -15109,7 +15208,7 @@ struct DecodableType
 {
 public:
     static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
 
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
@@ -15123,13 +15222,13 @@ namespace Attributes {
 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::LaundryWasherMode::Structs::ModeOptionStruct::Type>;
     using DecodableType =
-        chip::app::DataModel::DecodableList<chip::app::Clusters::RvcRunMode::Structs::ModeOptionStruct::DecodableType>;
-    using DecodableArgType =
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::RvcRunMode::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::RvcRunMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -15141,11 +15240,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::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
 {
@@ -15153,7 +15264,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::LaundryWasherMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -15161,37 +15272,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::LaundryWasherMode::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::LaundryWasherMode::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::LaundryWasherMode::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::LaundryWasherMode::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::LaundryWasherMode::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::LaundryWasherMode::Id; }
 };
 } // namespace ClusterRevision
 
@@ -15199,12 +15310,13 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::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;
@@ -15215,8 +15327,8 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace RvcRunMode
-namespace RvcCleanMode {
+} // namespace LaundryWasherMode
+namespace RefrigeratorAndTemperatureControlledCabinetMode {
 namespace Structs {
 namespace ModeTagStruct    = Clusters::detail::Structs::ModeTagStruct;
 namespace ModeOptionStruct = Clusters::detail::Structs::ModeOptionStruct;
@@ -15249,13 +15361,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::RefrigeratorAndTemperatureControlledCabinetMode::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::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -15264,7 +15376,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::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
 
     uint8_t newMode = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -15282,7 +15394,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::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
 
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
@@ -15298,7 +15410,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::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
 
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
@@ -15312,13 +15424,14 @@ namespace Attributes {
 namespace SupportedModes {
 struct TypeInfo
 {
-    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> &;
+    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::RvcCleanMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -15330,11 +15443,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::RefrigeratorAndTemperatureControlledCabinetMode::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::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace StartUpMode
 namespace OnMode {
 struct TypeInfo
 {
@@ -15342,7 +15467,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::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -15350,37 +15475,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::RefrigeratorAndTemperatureControlledCabinetMode::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::RefrigeratorAndTemperatureControlledCabinetMode::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::RefrigeratorAndTemperatureControlledCabinetMode::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::RefrigeratorAndTemperatureControlledCabinetMode::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::RefrigeratorAndTemperatureControlledCabinetMode::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::RefrigeratorAndTemperatureControlledCabinetMode::Id; }
 };
 } // namespace ClusterRevision
 
@@ -15388,12 +15513,13 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::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;
@@ -15404,40 +15530,160 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace RvcCleanMode
-namespace TemperatureControl {
-
-namespace Commands {
-// Forward-declarations so we can reference these later.
-
-namespace SetTemperature {
-struct Type;
-struct DecodableType;
-} // namespace SetTemperature
+} // namespace RefrigeratorAndTemperatureControlledCabinetMode
+namespace LaundryWasherControls {
 
-} // namespace Commands
+namespace Attributes {
 
-namespace Commands {
-namespace SetTemperature {
-enum class Fields : uint8_t
+namespace SpinSpeeds {
+struct TypeInfo
 {
-    kTargetTemperature      = 0,
-    kTargetTemperatureLevel = 1,
-};
+    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> &;
 
-struct Type
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SpinSpeeds::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace SpinSpeeds
+namespace SpinSpeedCurrent {
+struct TypeInfo
 {
-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; }
+    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> &;
 
-    Optional<int16_t> targetTemperature;
-    Optional<uint8_t> targetTemperatureLevel;
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SpinSpeedCurrent::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace SpinSpeedCurrent
+namespace NumberOfRinses {
+struct 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; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    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::LaundryWasherControls::Id; }
+};
+} // namespace EventList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    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::LaundryWasherControls::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::Id; }
+};
+} // namespace ClusterRevision
+
+struct TypeInfo
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherControls::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::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 LaundryWasherControls
+namespace RvcRunMode {
+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::RvcRunMode::Id; }
+
+    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::RvcRunMode::Commands::ChangeToModeResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -15445,124 +15691,124 @@ 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::RvcRunMode::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 TemperatureSetpoint {
-struct TypeInfo
+}; // namespace ChangeToMode
+namespace ChangeToModeResponse {
+enum class Fields : uint8_t
 {
-    using Type             = int16_t;
-    using DecodableType    = int16_t;
-    using DecodableArgType = int16_t;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::TemperatureSetpoint::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    kStatus     = 0,
+    kStatusText = 1,
 };
-} // namespace TemperatureSetpoint
-namespace MinTemperature {
-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::RvcRunMode::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 Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace MinTemperature
-namespace MaxTemperature {
-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::RvcRunMode::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::MaxTemperature::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 MaxTemperature
-namespace Step {
+}; // 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::RvcRunMode::Structs::ModeOptionStruct::Type>;
+    using DecodableType =
+        chip::app::DataModel::DecodableList<chip::app::Clusters::RvcRunMode::Structs::ModeOptionStruct::DecodableType>;
+    using DecodableArgType =
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::RvcRunMode::Structs::ModeOptionStruct::DecodableType> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Step::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Step
-namespace SelectedTemperatureLevel {
+} // namespace SupportedModes
+namespace CurrentMode {
 struct TypeInfo
 {
     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::SelectedTemperatureLevel::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace SelectedTemperatureLevel
-namespace SupportedTemperatureLevels {
+} // namespace CurrentMode
+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::RvcRunMode::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::RvcRunMode::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::RvcRunMode::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::RvcRunMode::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::RvcRunMode::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::RvcRunMode::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::RvcRunMode::Id; }
 };
 } // namespace ClusterRevision
 
@@ -15570,117 +15816,13 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::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::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 TemperatureControl
-namespace RefrigeratorAlarm {
-
-namespace Attributes {
-
-namespace Mask {
-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>;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Mask::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
-};
-} // namespace Mask
-namespace State {
-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>;
-
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::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::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::RefrigeratorAlarm::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::RefrigeratorAlarm::Id; }
-};
-} // namespace GeneratedCommandList
-namespace AcceptedCommandList {
-struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
-{
-    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::RefrigeratorAlarm::Id; }
-};
-} // namespace EventList
-namespace AttributeList {
-struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
-{
-    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::RefrigeratorAlarm::Id; }
-};
-} // namespace FeatureMap
-namespace ClusterRevision {
-struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
-{
-    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
-};
-} // namespace ClusterRevision
-
-struct TypeInfo
-{
-    struct DecodableType
-    {
-        static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::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::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;
@@ -15690,52 +15832,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 RvcRunMode
+namespace RvcCleanMode {
 namespace Structs {
 namespace ModeTagStruct    = Clusters::detail::Structs::ModeTagStruct;
 namespace ModeOptionStruct = Clusters::detail::Structs::ModeOptionStruct;
@@ -15768,13 +15866,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::RvcCleanMode::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::RvcCleanMode::Commands::ChangeToModeResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -15783,7 +15881,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::RvcCleanMode::Id; }
 
     uint8_t newMode = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -15801,7 +15899,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::RvcCleanMode::Id; }
 
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
@@ -15817,7 +15915,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::RvcCleanMode::Id; }
 
     uint8_t status = static_cast<uint8_t>(0);
     Optional<chip::CharSpan> statusText;
@@ -15831,13 +15929,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::RvcCleanMode::Structs::ModeOptionStruct::Type>;
     using DecodableType =
-        chip::app::DataModel::DecodableList<chip::app::Clusters::DishwasherMode::Structs::ModeOptionStruct::DecodableType>;
+        chip::app::DataModel::DecodableList<chip::app::Clusters::RvcCleanMode::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::RvcCleanMode::Structs::ModeOptionStruct::DecodableType> &;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -15849,23 +15947,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::RvcCleanMode::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
 {
@@ -15873,7 +15959,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::RvcCleanMode::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
@@ -15881,37 +15967,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::RvcCleanMode::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::RvcCleanMode::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::RvcCleanMode::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::RvcCleanMode::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::RvcCleanMode::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::RvcCleanMode::Id; }
 };
 } // namespace ClusterRevision
 
@@ -15919,13 +16005,12 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::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;
@@ -15936,57 +16021,1393 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace DishwasherMode
-namespace AirQuality {
+} // namespace RvcCleanMode
+namespace TemperatureControl {
 
-namespace Attributes {
+namespace Commands {
+// Forward-declarations so we can reference these later.
 
-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;
+namespace SetTemperature {
+struct Type;
+struct DecodableType;
+} // namespace SetTemperature
 
-    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
+} // namespace Commands
+
+namespace Commands {
+namespace SetTemperature {
+enum class Fields : uint8_t
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::AirQuality::Id; }
+    kTargetTemperature      = 0,
+    kTargetTemperatureLevel = 1,
 };
-} // namespace GeneratedCommandList
-namespace AcceptedCommandList {
-struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+
+struct Type
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::AirQuality::Id; }
+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; }
+
+    Optional<int16_t> targetTemperature;
+    Optional<uint8_t> targetTemperatureLevel;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace AcceptedCommandList
+
+struct DecodableType
+{
+public:
+    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 SetTemperature
+} // namespace Commands
+
+namespace Attributes {
+
+namespace TemperatureSetpoint {
+struct TypeInfo
+{
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::TemperatureSetpoint::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace TemperatureSetpoint
+namespace MinTemperature {
+struct TypeInfo
+{
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MinTemperature::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace MinTemperature
+namespace MaxTemperature {
+struct TypeInfo
+{
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MaxTemperature::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace MaxTemperature
+namespace Step {
+struct TypeInfo
+{
+    using Type             = int16_t;
+    using DecodableType    = int16_t;
+    using DecodableArgType = int16_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Step::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace Step
+namespace SelectedTemperatureLevel {
+struct TypeInfo
+{
+    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::SelectedTemperatureLevel::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace SelectedTemperatureLevel
+namespace SupportedTemperatureLevels {
+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> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SupportedTemperatureLevels::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace SupportedTemperatureLevels
+namespace GeneratedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+};
+} // namespace AcceptedCommandList
+namespace EventList {
+struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::Id; }
+};
+} // 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
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::TemperatureControl::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::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 TemperatureControl
+namespace RefrigeratorAlarm {
+
+namespace Attributes {
+
+namespace Mask {
+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>;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Mask::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace Mask
+namespace State {
+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>;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::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::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::RefrigeratorAlarm::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::RefrigeratorAlarm::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    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::RefrigeratorAlarm::Id; }
+};
+} // namespace EventList
+namespace AttributeList {
+struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+{
+    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::RefrigeratorAlarm::Id; }
+};
+} // namespace FeatureMap
+namespace ClusterRevision {
+struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::Id; }
+};
+} // namespace ClusterRevision
+
+struct TypeInfo
+{
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAlarm::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::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::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 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::DishwasherMode::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;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    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 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::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 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 ChangeToModeResponse
+} // namespace Commands
+
+namespace Attributes {
+
+namespace SupportedModes {
+struct TypeInfo
+{
+    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> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::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::DishwasherMode::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
+{
+    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::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::DishwasherMode::Id; }
+};
+} // namespace GeneratedCommandList
+namespace AcceptedCommandList {
+struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+{
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; }
+};
+} // namespace AcceptedCommandList
+namespace EventList {
+struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
+{
+    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::AirQuality::Id; }
+    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::AirQuality::Id; }
+    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::AirQuality::Id; }
+    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::AirQuality::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
 };
 } // namespace ClusterRevision
 
@@ -15994,12 +17415,18 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::AirQuality::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
 
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
-        Attributes::AirQuality::TypeInfo::DecodableType airQuality =
-            static_cast<chip::app::Clusters::AirQuality::AirQualityEnum>(0);
+        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;
@@ -16009,455 +17436,693 @@ struct TypeInfo
     };
 };
 } // 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 Events {
+namespace Notify {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
 
-namespace Commands {
-namespace SelfTestRequest {
 enum class Fields : uint8_t
 {
+    kActive   = 0,
+    kInactive = 1,
+    kState    = 2,
+    kMask     = 3,
 };
 
 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;
+    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;
 
-    using ResponseType = DataModel::NullObjectType;
+    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);
 
-    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::SelfTestRequest::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    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 SelfTestRequest
-} // namespace Commands
+} // 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 ExpressedState {
+namespace SupportedModes {
 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 = 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::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ExpressedState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenMode::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ExpressedState
-namespace SmokeState {
+} // namespace SupportedModes
+namespace CurrentMode {
 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             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SmokeState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenMode::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace SmokeState
-namespace COState {
+} // 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
 {
-    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::MicrowaveOvenMode::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::COState::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+        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 COState
-namespace BatteryAlert {
-struct TypeInfo
+} // 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
 {
-    using Type             = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
-    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
-    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::AlarmStateEnum;
+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; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::BatteryAlert::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    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; }
 };
-} // namespace BatteryAlert
-namespace DeviceMuted {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = chip::app::Clusters::SmokeCoAlarm::MuteStateEnum;
-    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::MuteStateEnum;
-    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::MuteStateEnum;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::SetCookingParameters::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DeviceMuted::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    Optional<uint8_t> cookMode;
+    Optional<uint32_t> cookTime;
+    Optional<uint8_t> powerSetting;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace DeviceMuted
-namespace TestInProgress {
-struct TypeInfo
+}; // namespace SetCookingParameters
+namespace AddMoreTime {
+enum class Fields : uint8_t
 {
-    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; }
+    kTimeToAdd = 0,
 };
-} // namespace TestInProgress
-namespace HardwareFaultAlert {
-struct TypeInfo
+
+struct Type
 {
-    using Type             = bool;
-    using DecodableType    = bool;
-    using DecodableArgType = bool;
+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; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::HardwareFaultAlert::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    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; }
 };
-} // namespace HardwareFaultAlert
-namespace EndOfServiceAlert {
-struct TypeInfo
+
+struct DecodableType
 {
-    using Type             = chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum;
-    using DecodableType    = chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum;
-    using DecodableArgType = chip::app::Clusters::SmokeCoAlarm::EndOfServiceEnum;
+public:
+    static constexpr CommandId GetCommandId() { return Commands::AddMoreTime::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::EndOfServiceAlert::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    uint32_t timeToAdd = static_cast<uint32_t>(0);
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace EndOfServiceAlert
-namespace InterconnectSmokeAlarm {
+}; // namespace AddMoreTime
+} // namespace Commands
+
+namespace Attributes {
+
+namespace CookTime {
 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             = uint32_t;
+    using DecodableType    = uint32_t;
+    using DecodableArgType = uint32_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::InterconnectSmokeAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CookTime::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace InterconnectSmokeAlarm
-namespace InterconnectCOAlarm {
+} // namespace CookTime
+namespace PowerSetting {
 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             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::InterconnectCOAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::PowerSetting::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace InterconnectCOAlarm
-namespace ContaminationState {
+} // namespace PowerSetting
+namespace MinPower {
 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             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ContaminationState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MinPower::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ContaminationState
-namespace SmokeSensitivityLevel {
+} // namespace MinPower
+namespace MaxPower {
 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             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SmokeSensitivityLevel::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::MaxPower::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace SmokeSensitivityLevel
-namespace ExpiryDate {
+} // namespace MaxPower
+namespace PowerStep {
 struct TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+    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::ExpiryDate::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::PowerStep::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ExpiryDate
+} // namespace PowerStep
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    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::SmokeCoAlarm::Id; }
+    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::SmokeCoAlarm::Id; }
+    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::SmokeCoAlarm::Id; }
+    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::SmokeCoAlarm::Id; }
+    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::SmokeCoAlarm::Id; }
+    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; }
 };
-} // namespace ClusterRevision
 
-struct TypeInfo
+struct DecodableType
 {
-    struct DecodableType
-    {
-        static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
-
-        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+public:
+    static constexpr CommandId GetCommandId() { return Commands::Pause::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
 
-        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);
-    };
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace Attributes
-namespace Events {
-namespace SmokeAlarm {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
-
+}; // namespace Pause
+namespace Stop {
 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);
+    // 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 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);
+    static constexpr CommandId GetCommandId() { return Commands::Stop::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace SmokeAlarm
-namespace COAlarm {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
-
+}; // namespace Stop
+namespace Start {
 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);
+    // 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 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);
+    static constexpr CommandId GetCommandId() { return Commands::Start::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace COAlarm
-namespace LowBattery {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-
+}; // namespace Start
+namespace Resume {
 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);
+    // 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 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::Resume::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace LowBattery
-namespace HardwareFault {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-
+}; // namespace Resume
+namespace OperationalCommandResponse {
 enum class Fields : uint8_t
 {
+    kCommandResponseState = 0,
 };
 
 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::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 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::OperationalCommandResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
 
+    Structs::ErrorStateStruct::DecodableType commandResponseState;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace HardwareFault
-namespace EndOfService {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+}; // namespace OperationalCommandResponse
+} // namespace Commands
 
-enum class Fields : uint8_t
+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; }
 };
-
-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::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;
+    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
 };
+} // namespace ClusterRevision
 
-struct DecodableType
+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; }
+    struct DecodableType
+    {
+        static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
 
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+        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 EndOfService
-namespace SelfTestComplete {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+} // 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::SelfTestComplete::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    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;
 };
 
@@ -16465,27 +18130,36 @@ 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; }
+    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 SelfTestComplete
-namespace AlarmMuted {
+} // 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::AlarmMuted::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    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;
 };
 
@@ -16493,109 +18167,112 @@ 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; }
+    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 AlarmMuted
-namespace MuteEnded {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+} // namespace OperationCompletion
+} // namespace Events
+} // namespace OperationalState
+namespace RvcOperationalState {
+namespace Structs {
+namespace ErrorStateStruct       = Clusters::detail::Structs::ErrorStateStruct;
+namespace OperationalStateStruct = Clusters::detail::Structs::OperationalStateStruct;
+} // namespace Structs
 
-enum class Fields : uint8_t
-{
-};
+namespace Commands {
+// Forward-declarations so we can reference these later.
 
-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;
+namespace Pause {
+struct Type;
+struct DecodableType;
+} // namespace Pause
 
-    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
-};
+namespace Stop {
+struct Type;
+struct DecodableType;
+} // namespace Stop
 
-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; }
+namespace Start {
+struct Type;
+struct DecodableType;
+} // namespace Start
 
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-} // namespace MuteEnded
-namespace InterconnectSmokeAlarm {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
+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
 {
-    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::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 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::Pause::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace InterconnectSmokeAlarm
-namespace InterconnectCOAlarm {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
-
+}; // namespace Pause
+namespace Stop {
 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);
+    // 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 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);
+    static constexpr CommandId GetCommandId() { return Commands::Stop::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace InterconnectCOAlarm
-namespace AllClear {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-
+}; // namespace Stop
+namespace Start {
 enum class Fields : uint8_t
 {
 };
@@ -16603,62 +18280,41 @@ 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;
+    // 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 PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return Events::AllClear::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::SmokeCoAlarm::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Start::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::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 {
+}; // namespace Start
+namespace Resume {
 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);
+    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 = DataModel::NullObjectType;
+    using ResponseType = Clusters::RvcOperationalState::Commands::OperationalCommandResponse::DecodableType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -16666,27 +18322,26 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::Reset::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::Resume::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
 
-    chip::BitMask<AlarmMap> alarms = static_cast<chip::BitMask<AlarmMap>>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Reset
-namespace ModifyEnabledAlarms {
+}; // namespace Resume
+namespace OperationalCommandResponse {
 enum class Fields : uint8_t
 {
-    kMask = 0,
+    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::ModifyEnabledAlarms::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::OperationalCommandResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
 
-    chip::BitMask<AlarmMap> mask = static_cast<chip::BitMask<AlarmMap>>(0);
+    Structs::ErrorStateStruct::Type commandResponseState;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -16698,99 +18353,125 @@ 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::OperationalCommandResponse::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
 
-    chip::BitMask<AlarmMap> mask = static_cast<chip::BitMask<AlarmMap>>(0);
+    Structs::ErrorStateStruct::DecodableType commandResponseState;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace ModifyEnabledAlarms
+}; // namespace OperationalCommandResponse
 } // namespace Commands
 
 namespace Attributes {
 
-namespace Mask {
+namespace PhaseList {
 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::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::DishwasherAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Mask::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::PhaseList::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Mask
-namespace Latch {
+} // namespace PhaseList
+namespace CurrentPhase {
 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::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::DishwasherAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Latch::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentPhase::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Latch
-namespace State {
+} // namespace CurrentPhase
+namespace CountdownTime {
 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::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::DishwasherAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::State::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CountdownTime::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace State
-namespace Supported {
+} // namespace CountdownTime
+namespace OperationalStateList {
 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::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::DishwasherAlarm::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Supported::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalStateList::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Supported
+} // 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::DishwasherAlarm::Id; }
+    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::DishwasherAlarm::Id; }
+    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::DishwasherAlarm::Id; }
+    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::DishwasherAlarm::Id; }
+    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::DishwasherAlarm::Id; }
+    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::DishwasherAlarm::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
 };
 } // namespace ClusterRevision
 
@@ -16798,18 +18479,16 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::DishwasherAlarm::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::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::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;
@@ -16820,118 +18499,259 @@ struct TypeInfo
 };
 } // namespace Attributes
 namespace Events {
-namespace Notify {
+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::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
 {
-    kActive   = 0,
-    kInactive = 1,
-    kState    = 2,
-    kMask     = 3,
+    kCompletionErrorCode  = 0,
+    kTotalOperationalTime = 1,
+    kPausedTime           = 2,
 };
 
 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::OperationCompletion::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::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);
+    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;
+};
+
+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 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);
+    static constexpr CommandId GetCommandId() { return Commands::ResetCondition::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
 
     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 ResetCondition
+} // namespace Commands
 
 namespace Attributes {
 
-namespace SupportedModes {
+namespace Condition {
 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> &;
+    using Type             = chip::Percent;
+    using DecodableType    = chip::Percent;
+    using DecodableArgType = chip::Percent;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenMode::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Condition::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace SupportedModes
-namespace CurrentMode {
+} // namespace Condition
+namespace DegradationDirection {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    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::MicrowaveOvenMode::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DegradationDirection::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace CurrentMode
+} // 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> &;
+
+    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
+{
+    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> &;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::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::MicrowaveOvenMode::Id; }
+    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::MicrowaveOvenMode::Id; }
+    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::MicrowaveOvenMode::Id; }
+    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::MicrowaveOvenMode::Id; }
+    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::MicrowaveOvenMode::Id; }
+    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::MicrowaveOvenMode::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
 };
 } // namespace ClusterRevision
 
@@ -16939,12 +18759,18 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenMode::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::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::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;
@@ -16954,77 +18780,56 @@ struct TypeInfo
     };
 };
 } // 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 {
+} // namespace HepaFilterMonitoring
+namespace ActivatedCarbonFilterMonitoring {
+namespace Structs {
+namespace ReplacementProductStruct {
 enum class Fields : uint8_t
 {
-    kCookMode     = 0,
-    kCookTime     = 1,
-    kPowerSetting = 2,
+    kProductIdentifierType  = 0,
+    kProductIdentifierValue = 1,
 };
 
 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; }
+    ProductIdentifierTypeEnum productIdentifierType = static_cast<ProductIdentifierTypeEnum>(0);
+    chip::CharSpan productIdentifierValue;
 
-    Optional<uint8_t> cookMode;
-    Optional<uint32_t> cookTime;
-    Optional<uint8_t> powerSetting;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
 
-    using ResponseType = DataModel::NullObjectType;
+using DecodableType = Type;
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
+} // namespace ReplacementProductStruct
+} // namespace Structs
 
-struct DecodableType
-{
-public:
-    static constexpr CommandId GetCommandId() { return Commands::SetCookingParameters::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+namespace Commands {
+// Forward-declarations so we can reference these later.
 
-    Optional<uint8_t> cookMode;
-    Optional<uint32_t> cookTime;
-    Optional<uint8_t> powerSetting;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
-};
-}; // namespace SetCookingParameters
-namespace AddMoreTime {
+namespace ResetCondition {
+struct Type;
+struct DecodableType;
+} // namespace ResetCondition
+
+} // namespace Commands
+
+namespace Commands {
+namespace ResetCondition {
 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);
+    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;
 
@@ -17036,111 +18841,125 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::AddMoreTime::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::ResetCondition::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
 
-    uint32_t timeToAdd = static_cast<uint32_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace AddMoreTime
+}; // namespace ResetCondition
 } // namespace Commands
 
 namespace Attributes {
 
-namespace CookTime {
+namespace Condition {
 struct TypeInfo
 {
-    using Type             = uint32_t;
-    using DecodableType    = uint32_t;
-    using DecodableArgType = uint32_t;
+    using Type             = chip::Percent;
+    using DecodableType    = chip::Percent;
+    using DecodableArgType = chip::Percent;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CookTime::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Condition::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace CookTime
-namespace PowerSetting {
+} // namespace Condition
+namespace DegradationDirection {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    using Type             = chip::app::Clusters::ActivatedCarbonFilterMonitoring::DegradationDirectionEnum;
+    using DecodableType    = chip::app::Clusters::ActivatedCarbonFilterMonitoring::DegradationDirectionEnum;
+    using DecodableArgType = chip::app::Clusters::ActivatedCarbonFilterMonitoring::DegradationDirectionEnum;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::PowerSetting::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DegradationDirection::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace PowerSetting
-namespace MinPower {
+} // namespace DegradationDirection
+namespace ChangeIndication {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    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::MicrowaveOvenControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::MinPower::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::InPlaceIndicator::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace MinPower
-namespace MaxPower {
+} // namespace InPlaceIndicator
+namespace LastChangedTime {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    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::MicrowaveOvenControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::MaxPower::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::LastChangedTime::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace MaxPower
-namespace PowerStep {
+} // namespace LastChangedTime
+namespace ReplacementProductList {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    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::MicrowaveOvenControl::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::PowerStep::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ReplacementProductList::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace PowerStep
+} // namespace ReplacementProductList
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+    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::MicrowaveOvenControl::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
 };
 } // namespace AcceptedCommandList
 namespace EventList {
 struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
 };
 } // namespace EventList
 namespace AttributeList {
 struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
 };
 } // namespace AttributeList
 namespace FeatureMap {
 struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
 };
 } // namespace FeatureMap
 namespace ClusterRevision {
 struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
 };
 } // namespace ClusterRevision
 
@@ -17148,15 +18967,18 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::MicrowaveOvenControl::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::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::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;
@@ -17166,170 +18988,34 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace MicrowaveOvenControl
-namespace OperationalState {
-namespace Structs {
-namespace ErrorStateStruct       = Clusters::detail::Structs::ErrorStateStruct;
-namespace OperationalStateStruct = Clusters::detail::Structs::OperationalStateStruct;
-} // namespace Structs
+} // namespace ActivatedCarbonFilterMonitoring
+namespace BooleanSensorConfiguration {
 
 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 {
+namespace SuppressRequest {
 struct Type;
 struct DecodableType;
-} // namespace OperationalCommandResponse
+} // namespace SuppressRequest
 
 } // 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 {
+namespace SuppressRequest {
 enum class Fields : uint8_t
 {
-    kCommandResponseState = 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::OperationalCommandResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SuppressRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
 
-    Structs::ErrorStateStruct::Type commandResponseState;
+    chip::BitMask<AlarmModeBitmap> alarmsToSuppress = static_cast<chip::BitMask<AlarmModeBitmap>>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
@@ -17341,125 +19027,99 @@ 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::SuppressRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
 
-    Structs::ErrorStateStruct::DecodableType commandResponseState;
+    chip::BitMask<AlarmModeBitmap> alarmsToSuppress = static_cast<chip::BitMask<AlarmModeBitmap>>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace OperationalCommandResponse
+}; // namespace SuppressRequest
 } // 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 {
+namespace SensitivityLevel {
 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             = 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::OperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CountdownTime::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::SensitivityLevel::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> &;
+};
+} // namespace SensitivityLevel
+namespace AlarmsActive {
+struct TypeInfo
+{
+    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::OperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalStateList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AlarmsActive::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace OperationalStateList
-namespace OperationalState {
+} // namespace AlarmsActive
+namespace AlarmsSuppressed {
 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::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::OperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AlarmsSuppressed::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace OperationalState
-namespace OperationalError {
+} // namespace AlarmsSuppressed
+namespace AlarmsEnabled {
 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::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::OperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalError::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AlarmsEnabled::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace OperationalError
+} // namespace AlarmsEnabled
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::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::OperationalState::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::OperationalState::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::OperationalState::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::OperationalState::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::OperationalState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
 };
 } // namespace ClusterRevision
 
@@ -17467,17 +19127,18 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::OperationalState::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::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::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;
@@ -17488,23 +19149,25 @@ struct TypeInfo
 };
 } // namespace Attributes
 namespace Events {
-namespace OperationalError {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
+namespace AlarmsStateChanged {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
 
 enum class Fields : uint8_t
 {
-    kErrorState = 0,
+    kAlarmsActive     = 0,
+    kAlarmsSuppressed = 1,
 };
 
 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 EventId GetEventId() { return Events::AlarmsStateChanged::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
     static constexpr bool kIsFabricScoped = false;
 
-    Structs::ErrorStateStruct::Type errorState;
+    chip::BitMask<AlarmModeBitmap> alarmsActive = static_cast<chip::BitMask<AlarmModeBitmap>>(0);
+    Optional<chip::BitMask<AlarmModeBitmap>> alarmsSuppressed;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
@@ -17513,36 +19176,30 @@ 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; }
+    static constexpr EventId GetEventId() { return Events::AlarmsStateChanged::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
 
-    Structs::ErrorStateStruct::DecodableType errorState;
+    chip::BitMask<AlarmModeBitmap> alarmsActive = static_cast<chip::BitMask<AlarmModeBitmap>>(0);
+    Optional<chip::BitMask<AlarmModeBitmap>> alarmsSuppressed;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace OperationalError
-namespace OperationCompletion {
+} // namespace AlarmsStateChanged
+namespace SensorFault {
 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 EventId GetEventId() { return Events::SensorFault::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::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;
 };
 
@@ -17550,70 +19207,55 @@ 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;
+    static constexpr EventId GetEventId() { return Events::SensorFault::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::BooleanSensorConfiguration::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace OperationCompletion
+} // namespace SensorFault
 } // namespace Events
-} // namespace OperationalState
-namespace RvcOperationalState {
-namespace Structs {
-namespace ErrorStateStruct       = Clusters::detail::Structs::ErrorStateStruct;
-namespace OperationalStateStruct = Clusters::detail::Structs::OperationalStateStruct;
-} // namespace Structs
+} // namespace BooleanSensorConfiguration
+namespace ValveConfigurationAndControl {
 
 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 {
+namespace Open {
 struct Type;
 struct DecodableType;
-} // namespace Start
+} // namespace Open
 
-namespace Resume {
+namespace Close {
 struct Type;
 struct DecodableType;
-} // namespace Resume
+} // namespace Close
 
-namespace OperationalCommandResponse {
+namespace SetLevel {
 struct Type;
 struct DecodableType;
-} // namespace OperationalCommandResponse
+} // namespace SetLevel
 
 } // namespace Commands
 
 namespace Commands {
-namespace Pause {
+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::Pause::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::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::RvcOperationalState::Commands::OperationalCommandResponse::DecodableType;
+    using ResponseType = DataModel::NullObjectType;
 
     static constexpr bool MustUseTimedInvoke() { return false; }
 };
@@ -17621,13 +19263,14 @@ 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::Open::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
 
+    Optional<uint32_t> openDuration;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Pause
-namespace Stop {
+}; // namespace Open
+namespace Close {
 enum class Fields : uint8_t
 {
 };
@@ -17636,12 +19279,12 @@ 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::Close::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
 
     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; }
 };
@@ -17649,27 +19292,32 @@ 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::Close::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace Stop
-namespace Start {
+}; // namespace Close
+namespace SetLevel {
 enum class Fields : uint8_t
 {
+    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::Start::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::SetLevel::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+
+    chip::Percent level = static_cast<chip::Percent>(0);
+    Optional<uint32_t> openDuration;
 
     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; }
 };
@@ -17677,184 +19325,174 @@ 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::SetLevel::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
 
+    chip::Percent level = static_cast<chip::Percent>(0);
+    Optional<uint32_t> openDuration;
     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;
+}; // namespace SetLevel
+} // namespace Commands
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
-};
+namespace Attributes {
 
-struct DecodableType
+namespace OpenDuration {
+struct TypeInfo
 {
-public:
-    static constexpr CommandId GetCommandId() { return Commands::Resume::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    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 Decode(TLV::TLVReader & reader);
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OpenDuration::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-}; // namespace Resume
-namespace OperationalCommandResponse {
-enum class Fields : uint8_t
+} // namespace OpenDuration
+namespace AutoCloseTime {
+struct TypeInfo
 {
-    kCommandResponseState = 0,
-};
+    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> &;
 
-struct Type
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::AutoCloseTime::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace AutoCloseTime
+namespace RemainingDuration {
+struct TypeInfo
 {
-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;
+    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 bool MustUseTimedInvoke() { return false; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::RemainingDuration::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-
-struct DecodableType
+} // namespace RemainingDuration
+namespace CurrentState {
+struct TypeInfo
 {
-public:
-    static constexpr CommandId GetCommandId() { return Commands::OperationalCommandResponse::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+    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> &;
 
-    Structs::ErrorStateStruct::DecodableType commandResponseState;
-    CHIP_ERROR Decode(TLV::TLVReader & reader);
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentState::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
 };
-}; // namespace OperationalCommandResponse
-} // namespace Commands
-
-namespace Attributes {
-
-namespace PhaseList {
+} // namespace CurrentState
+namespace TargetState {
 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<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::RvcOperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::PhaseList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::TargetState::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace PhaseList
-namespace CurrentPhase {
+} // namespace TargetState
+namespace StartUpState {
 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::ValveConfigurationAndControl::ValveStateEnum;
+    using DecodableType    = chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum;
+    using DecodableArgType = chip::app::Clusters::ValveConfigurationAndControl::ValveStateEnum;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentPhase::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::StartUpState::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace CurrentPhase
-namespace CountdownTime {
+} // namespace StartUpState
+namespace CurrentLevel {
 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             = 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::RvcOperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::CountdownTime::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::CurrentLevel::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace CountdownTime
-namespace OperationalStateList {
+} // namespace CurrentLevel
+namespace TargetLevel {
 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             = 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::RvcOperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalStateList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::TargetLevel::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace OperationalStateList
-namespace OperationalState {
+} // namespace TargetLevel
+namespace OpenLevel {
 struct TypeInfo
 {
-    using Type             = uint8_t;
-    using DecodableType    = uint8_t;
-    using DecodableArgType = uint8_t;
+    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::RvcOperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::OpenLevel::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace OperationalState
-namespace OperationalError {
+} // namespace OpenLevel
+namespace ValveFault {
 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             = 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::RvcOperationalState::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::OperationalError::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ValveFault::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace OperationalError
+} // namespace ValveFault
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::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::RvcOperationalState::Id; }
+    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::RvcOperationalState::Id; }
+    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::RvcOperationalState::Id; }
+    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::RvcOperationalState::Id; }
+    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::RvcOperationalState::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
 };
 } // namespace ClusterRevision
 
@@ -17862,16 +19500,22 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::RvcOperationalState::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::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::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;
@@ -17882,23 +19526,23 @@ struct TypeInfo
 };
 } // namespace Attributes
 namespace Events {
-namespace OperationalError {
-static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
+namespace ValveStateChanged {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
 
 enum class Fields : uint8_t
 {
-    kErrorState = 0,
+    kValveState = 0,
 };
 
 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::ValveStateChanged::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
     static constexpr bool kIsFabricScoped = false;
 
-    Structs::ErrorStateStruct::Type errorState;
+    ValveStateEnum valveState = static_cast<ValveStateEnum>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
@@ -17907,35 +19551,31 @@ 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::ValveStateChanged::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
 
-    Structs::ErrorStateStruct::DecodableType errorState;
+    ValveStateEnum valveState = static_cast<ValveStateEnum>(0);
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace OperationalError
-namespace OperationCompletion {
+} // namespace ValveStateChanged
+namespace ValveFault {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
 
 enum class Fields : uint8_t
 {
-    kCompletionErrorCode  = 0,
-    kTotalOperationalTime = 1,
-    kPausedTime           = 2,
+    kValveFault = 0,
 };
 
 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 EventId GetEventId() { return Events::ValveFault::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::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::BitMask<ValveFaultBitmap> valveFault = static_cast<chip::BitMask<ValveFaultBitmap>>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
@@ -17944,32 +19584,28 @@ 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 EventId GetEventId() { return Events::ValveFault::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::ValveConfigurationAndControl::Id; }
 
-    uint8_t completionErrorCode = static_cast<uint8_t>(0);
-    Optional<DataModel::Nullable<uint32_t>> totalOperationalTime;
-    Optional<DataModel::Nullable<uint32_t>> pausedTime;
+    chip::BitMask<ValveFaultBitmap> valveFault = static_cast<chip::BitMask<ValveFaultBitmap>>(0);
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-} // namespace OperationCompletion
+} // namespace ValveFault
 } // namespace Events
-} // namespace RvcOperationalState
-namespace HepaFilterMonitoring {
+} // namespace ValveConfigurationAndControl
+namespace DemandResponseLoadControl {
 namespace Structs {
-namespace ReplacementProductStruct {
+namespace HeatingSourceControlStruct {
 enum class Fields : uint8_t
 {
-    kProductIdentifierType  = 0,
-    kProductIdentifierValue = 1,
+    kHeatingSource = 0,
 };
 
 struct Type
 {
 public:
-    ProductIdentifierTypeEnum productIdentifierType = static_cast<ProductIdentifierTypeEnum>(0);
-    chip::CharSpan productIdentifierValue;
+    HeatingSourceEnum heatingSource = static_cast<HeatingSourceEnum>(0);
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 
@@ -17980,229 +19616,372 @@ struct Type
 
 using DecodableType = Type;
 
-} // namespace ReplacementProductStruct
-} // namespace Structs
+} // namespace HeatingSourceControlStruct
+namespace PowerSavingsControlStruct {
+enum class Fields : uint8_t
+{
+    kPowerSavings = 0,
+};
 
-namespace Commands {
-// Forward-declarations so we can reference these later.
+struct Type
+{
+public:
+    PowerSavingsEnum powerSavings = static_cast<PowerSavingsEnum>(0);
 
-namespace ResetCondition {
-struct Type;
-struct DecodableType;
-} // namespace ResetCondition
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
 
-} // namespace Commands
+    static constexpr bool kIsFabricScoped = false;
 
-namespace Commands {
-namespace ResetCondition {
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+};
+
+using DecodableType = Type;
+
+} // namespace PowerSavingsControlStruct
+namespace DutyCycleControlStruct {
 enum class Fields : uint8_t
 {
+    kDutyCycle = 0,
 };
 
 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::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;
+};
 
-    using ResponseType = DataModel::NullObjectType;
+using DecodableType = Type;
 
-    static constexpr bool MustUseTimedInvoke() { return false; }
+} // namespace DutyCycleControlStruct
+namespace AverageLoadControlStruct {
+enum class Fields : uint8_t
+{
+    kLoadAdjustment = 0,
 };
 
-struct DecodableType
+struct Type
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::ResetCondition::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+    int8_t loadAdjustment = static_cast<int8_t>(0);
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
-}; // namespace ResetCondition
-} // namespace Commands
 
-namespace Attributes {
+using DecodableType = Type;
 
-namespace Condition {
-struct TypeInfo
+} // namespace AverageLoadControlStruct
+namespace TemperatureControlStruct {
+enum class Fields : uint8_t
 {
-    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; }
+    kCoolingTempOffset   = 0,
+    kHeatingtTempOffset  = 1,
+    kCoolingTempSetpoint = 2,
+    kHeatingTempSetpoint = 3,
 };
-} // namespace Condition
-namespace DegradationDirection {
-struct TypeInfo
+
+struct Type
 {
-    using Type             = chip::app::Clusters::HepaFilterMonitoring::DegradationDirectionEnum;
-    using DecodableType    = chip::app::Clusters::HepaFilterMonitoring::DegradationDirectionEnum;
-    using DecodableArgType = chip::app::Clusters::HepaFilterMonitoring::DegradationDirectionEnum;
+public:
+    Optional<DataModel::Nullable<uint16_t>> coolingTempOffset;
+    Optional<DataModel::Nullable<uint16_t>> heatingtTempOffset;
+    Optional<DataModel::Nullable<int16_t>> coolingTempSetpoint;
+    Optional<DataModel::Nullable<int16_t>> heatingTempSetpoint;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DegradationDirection::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
-} // 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; }
+using DecodableType = Type;
+
+} // namespace TemperatureControlStruct
+namespace LoadControlEventTransitionStruct {
+enum class Fields : uint8_t
+{
+    kDuration             = 0,
+    kControl              = 1,
+    kTemperatureControl   = 2,
+    kAverageLoadControl   = 3,
+    kDutyCycleControl     = 4,
+    kPowerSavingsControl  = 5,
+    kHeatingSourceControl = 6,
 };
-} // namespace ChangeIndication
-namespace InPlaceIndicator {
-struct TypeInfo
+
+struct Type
 {
-    using Type             = bool;
-    using DecodableType    = bool;
-    using DecodableArgType = bool;
+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;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::InPlaceIndicator::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
-} // namespace InPlaceIndicator
-namespace LastChangedTime {
-struct TypeInfo
+
+using DecodableType = Type;
+
+} // namespace LoadControlEventTransitionStruct
+namespace LoadControlEventStruct {
+enum class Fields : uint8_t
 {
-    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> &;
+    kEventID         = 0,
+    kProgramID       = 1,
+    kControl         = 2,
+    kDeviceClass     = 3,
+    kEnrollmentGroup = 4,
+    kCriticality     = 5,
+    kStartTime       = 6,
+    kTransitions     = 7,
+};
 
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::LastChangedTime::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+struct Type
+{
+public:
+    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;
+
+    static constexpr bool kIsFabricScoped = false;
+
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 };
-} // namespace LastChangedTime
-namespace ReplacementProductList {
-struct TypeInfo
+
+struct DecodableType
 {
-    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> &;
+public:
+    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;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ReplacementProductList::Id; }
-    static constexpr bool MustUseTimedWrite() { return false; }
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+
+    static constexpr bool kIsFabricScoped = false;
 };
-} // namespace ReplacementProductList
-namespace GeneratedCommandList {
-struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
+
+} // namespace LoadControlEventStruct
+namespace LoadControlProgramStruct {
+enum class Fields : uint8_t
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+    kProgramID             = 0,
+    kName                  = 1,
+    kEnrollmentGroup       = 2,
+    kRandomStartMinutes    = 3,
+    kRandomDurationMinutes = 4,
 };
-} // namespace GeneratedCommandList
-namespace AcceptedCommandList {
-struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo
+
+struct Type
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+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 AcceptedCommandList
-namespace EventList {
-struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo
+
+using DecodableType = Type;
+
+} // namespace LoadControlProgramStruct
+} // namespace Structs
+
+namespace Commands {
+// Forward-declarations so we can reference these later.
+
+namespace RegisterLoadControlProgramRequest {
+struct Type;
+struct DecodableType;
+} // namespace RegisterLoadControlProgramRequest
+
+namespace UnregisterLoadControlProgramRequest {
+struct Type;
+struct DecodableType;
+} // namespace UnregisterLoadControlProgramRequest
+
+namespace AddLoadControlEventRequest {
+struct Type;
+struct DecodableType;
+} // namespace AddLoadControlEventRequest
+
+namespace RemoveLoadControlEventRequest {
+struct Type;
+struct DecodableType;
+} // namespace RemoveLoadControlEventRequest
+
+namespace ClearLoadControlEventsRequest {
+struct Type;
+struct DecodableType;
+} // namespace ClearLoadControlEventsRequest
+
+} // namespace Commands
+
+namespace Commands {
+namespace RegisterLoadControlProgramRequest {
+enum class Fields : uint8_t
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+    kLoadControlProgram = 0,
 };
-} // namespace EventList
-namespace AttributeList {
-struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo
+
+struct Type
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    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 = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace AttributeList
-namespace FeatureMap {
-struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo
+
+struct DecodableType
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+public:
+    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 FeatureMap
-namespace ClusterRevision {
-struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo
+}; // namespace RegisterLoadControlProgramRequest
+namespace UnregisterLoadControlProgramRequest {
+enum class Fields : uint8_t
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+    kLoadControlProgramID = 0,
 };
-} // namespace ClusterRevision
 
-struct TypeInfo
+struct Type
 {
-    struct DecodableType
-    {
-        static constexpr ClusterId GetClusterId() { return Clusters::HepaFilterMonitoring::Id; }
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::UnregisterLoadControlProgramRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 
-        CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
+    chip::ByteSpan loadControlProgramID;
 
-        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);
-    };
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
-} // namespace Attributes
-} // namespace HepaFilterMonitoring
-namespace ActivatedCarbonFilterMonitoring {
-namespace Structs {
-namespace ReplacementProductStruct {
+
+struct DecodableType
+{
+public:
+    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 UnregisterLoadControlProgramRequest
+namespace AddLoadControlEventRequest {
 enum class Fields : uint8_t
 {
-    kProductIdentifierType  = 0,
-    kProductIdentifierValue = 1,
+    kEvent = 0,
 };
 
 struct Type
 {
 public:
-    ProductIdentifierTypeEnum productIdentifierType = static_cast<ProductIdentifierTypeEnum>(0);
-    chip::CharSpan productIdentifierValue;
-
-    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::AddLoadControlEventRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 
-    static constexpr bool kIsFabricScoped = false;
+    Structs::LoadControlEventStruct::Type event;
 
     CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
+
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
 };
 
-using DecodableType = Type;
+struct DecodableType
+{
+public:
+    static constexpr CommandId GetCommandId() { return Commands::AddLoadControlEventRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 
-} // namespace ReplacementProductStruct
-} // namespace Structs
+    Structs::LoadControlEventStruct::DecodableType event;
+    CHIP_ERROR Decode(TLV::TLVReader & reader);
+};
+}; // namespace AddLoadControlEventRequest
+namespace RemoveLoadControlEventRequest {
+enum class Fields : uint8_t
+{
+    kEventID       = 0,
+    kCancelControl = 1,
+};
 
-namespace Commands {
-// Forward-declarations so we can reference these later.
+struct Type
+{
+public:
+    // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
+    static constexpr CommandId GetCommandId() { return Commands::RemoveLoadControlEventRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 
-namespace ResetCondition {
-struct Type;
-struct DecodableType;
-} // namespace ResetCondition
+    chip::ByteSpan eventID;
+    chip::BitMask<CancelControlBitmap> cancelControl = static_cast<chip::BitMask<CancelControlBitmap>>(0);
 
-} // namespace Commands
+    CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const;
 
-namespace Commands {
-namespace ResetCondition {
+    using ResponseType = DataModel::NullObjectType;
+
+    static constexpr bool MustUseTimedInvoke() { return false; }
+};
+
+struct DecodableType
+{
+public:
+    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 RemoveLoadControlEventRequest
+namespace ClearLoadControlEventsRequest {
 enum class Fields : uint8_t
 {
 };
@@ -18211,8 +19990,8 @@ 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::ActivatedCarbonFilterMonitoring::Id; }
+    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;
 
@@ -18224,125 +20003,167 @@ struct Type
 struct DecodableType
 {
 public:
-    static constexpr CommandId GetCommandId() { return Commands::ResetCondition::Id; }
-    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::ClearLoadControlEventsRequest::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
-}; // namespace ResetCondition
+}; // namespace ClearLoadControlEventsRequest
 } // namespace Commands
 
 namespace Attributes {
 
-namespace Condition {
+namespace DeviceClass {
 struct TypeInfo
 {
-    using Type             = chip::Percent;
-    using DecodableType    = chip::Percent;
-    using DecodableArgType = chip::Percent;
+    using Type             = chip::BitMask<chip::app::Clusters::DemandResponseLoadControl::DeviceClassBitmap>;
+    using DecodableType    = chip::BitMask<chip::app::Clusters::DemandResponseLoadControl::DeviceClassBitmap>;
+    using DecodableArgType = chip::BitMask<chip::app::Clusters::DemandResponseLoadControl::DeviceClassBitmap>;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::Condition::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DeviceClass::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace Condition
-namespace DegradationDirection {
+} // namespace DeviceClass
+namespace LoadControlPrograms {
 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::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::ActivatedCarbonFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::DegradationDirection::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::LoadControlPrograms::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace DegradationDirection
-namespace ChangeIndication {
+} // namespace LoadControlPrograms
+namespace NumberOfLoadControlPrograms {
 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             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ChangeIndication::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfLoadControlPrograms::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ChangeIndication
-namespace InPlaceIndicator {
+} // namespace NumberOfLoadControlPrograms
+namespace Events {
 struct TypeInfo
 {
-    using Type             = bool;
-    using DecodableType    = bool;
-    using DecodableArgType = bool;
+    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::ActivatedCarbonFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::InPlaceIndicator::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::Events::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace InPlaceIndicator
-namespace LastChangedTime {
+} // namespace Events
+namespace ActiveEvents {
 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 =
+        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::ActivatedCarbonFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::LastChangedTime::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::ActiveEvents::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace LastChangedTime
-namespace ReplacementProductList {
+} // namespace ActiveEvents
+namespace NumberOfEventsPerProgram {
 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             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
 
-    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
-    static constexpr AttributeId GetAttributeId() { return Attributes::ReplacementProductList::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfEventsPerProgram::Id; }
     static constexpr bool MustUseTimedWrite() { return false; }
 };
-} // namespace ReplacementProductList
+} // namespace NumberOfEventsPerProgram
+namespace NumberOfTransistions {
+struct TypeInfo
+{
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::NumberOfTransistions::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace NumberOfTransistions
+namespace DefaultRandomStart {
+struct TypeInfo
+{
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DefaultRandomStart::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace DefaultRandomStart
+namespace DefaultRandomDuration {
+struct TypeInfo
+{
+    using Type             = uint8_t;
+    using DecodableType    = uint8_t;
+    using DecodableArgType = uint8_t;
+
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+    static constexpr AttributeId GetAttributeId() { return Attributes::DefaultRandomDuration::Id; }
+    static constexpr bool MustUseTimedWrite() { return false; }
+};
+} // namespace DefaultRandomDuration
 namespace GeneratedCommandList {
 struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo
 {
-    static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::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::ActivatedCarbonFilterMonitoring::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::ActivatedCarbonFilterMonitoring::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::ActivatedCarbonFilterMonitoring::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::ActivatedCarbonFilterMonitoring::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::ActivatedCarbonFilterMonitoring::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
 };
 } // namespace ClusterRevision
 
@@ -18350,18 +20171,20 @@ struct TypeInfo
 {
     struct DecodableType
     {
-        static constexpr ClusterId GetClusterId() { return Clusters::ActivatedCarbonFilterMonitoring::Id; }
+        static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::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::DeviceClass::TypeInfo::DecodableType deviceClass =
+            static_cast<chip::BitMask<chip::app::Clusters::DemandResponseLoadControl::DeviceClassBitmap>>(0);
+        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::NumberOfTransistions::TypeInfo::DecodableType numberOfTransistions         = 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;
@@ -18371,7 +20194,69 @@ struct TypeInfo
     };
 };
 } // namespace Attributes
-} // namespace ActivatedCarbonFilterMonitoring
+namespace Events {
+namespace LoadControlEventStatusChange {
+static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
+
+enum class Fields : uint8_t
+{
+    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::LoadControlEventStatusChange::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+    static constexpr bool kIsFabricScoped = false;
+
+    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;
+};
+
+struct DecodableType
+{
+public:
+    static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
+    static constexpr EventId GetEventId() { return Events::LoadControlEventStatusChange::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::DemandResponseLoadControl::Id; }
+
+    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 LoadControlEventStatusChange
+} // namespace Events
+} // namespace DemandResponseLoadControl
 namespace DoorLock {
 namespace Structs {
 namespace CredentialStruct {
@@ -23188,9 +25073,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; }
@@ -23200,9 +25085,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; }
@@ -23212,9 +25097,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; }
@@ -23266,9 +25151,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;
@@ -28111,9 +29999,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
 {
@@ -28160,6 +30061,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;
@@ -28584,7 +30486,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;
@@ -28600,7 +30502,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);
 };
@@ -29723,7 +31625,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;
 
@@ -29738,7 +31640,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
@@ -30080,7 +31982,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;
@@ -30096,7 +31998,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);
 };
@@ -30120,9 +32022,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; }
@@ -30175,7 +32077,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;
diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h
index c5f97b46c44f83..faaf79f8abc47b 100644
--- a/zzz_generated/app-common/app-common/zap-generated/enums.h
+++ b/zzz_generated/app-common/app-common/zap-generated/enums.h
@@ -24,22 +24,6 @@
 
 // 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
 {
@@ -62,32 +46,3 @@ enum EmberAfEnhancedColorMode : uint8_t
     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 dc9d4c9ba9fbb6..1bc7d5674bb9f3 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
@@ -2441,6 +2449,94 @@ 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 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 ModeSelect {
 namespace Attributes {
 
@@ -3325,6 +3421,188 @@ 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 DeviceClass {
+static constexpr AttributeId Id = 0x00000000;
+} // namespace DeviceClass
+
+namespace LoadControlPrograms {
+static constexpr AttributeId Id = 0x00000001;
+} // namespace LoadControlPrograms
+
+namespace NumberOfLoadControlPrograms {
+static constexpr AttributeId Id = 0x00000002;
+} // namespace NumberOfLoadControlPrograms
+
+namespace Events {
+static constexpr AttributeId Id = 0x00000003;
+} // namespace Events
+
+namespace ActiveEvents {
+static constexpr AttributeId Id = 0x00000004;
+} // namespace ActiveEvents
+
+namespace NumberOfEventsPerProgram {
+static constexpr AttributeId Id = 0x00000005;
+} // namespace NumberOfEventsPerProgram
+
+namespace NumberOfTransistions {
+static constexpr AttributeId Id = 0x00000006;
+} // namespace NumberOfTransistions
+
+namespace DefaultRandomStart {
+static constexpr AttributeId Id = 0x00000007;
+} // namespace DefaultRandomStart
+
+namespace DefaultRandomDuration {
+static constexpr AttributeId Id = 0x00000008;
+} // 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 DoorLock {
 namespace Attributes {
 
@@ -5558,6 +5836,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 a393b368ff510c..814cbf6dc40ed5 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,12 @@ static constexpr ClusterId Id = 0x00000045;
 namespace IcdManagement {
 static constexpr ClusterId Id = 0x00000046;
 } // namespace IcdManagement
+namespace Timer {
+static constexpr ClusterId Id = 0x00000047;
+} // namespace Timer
+namespace OvenMode {
+static constexpr ClusterId Id = 0x00000049;
+} // namespace OvenMode
 namespace ModeSelect {
 static constexpr ClusterId Id = 0x00000050;
 } // namespace ModeSelect
@@ -202,6 +208,15 @@ 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 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 f8aef6170b41a7..335618b7622aab 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
 
@@ -639,6 +647,42 @@ static constexpr CommandId Id = 0x00000003;
 } // 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 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 {
 
@@ -839,6 +883,60 @@ 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 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..1a019ac83d5bf5 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
@@ -365,6 +365,44 @@ 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 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 c6db1f89ea8020..fe38b8563b05a7 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,18 @@
 #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_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_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
@@ -402,6 +414,28 @@
 #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_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
@@ -720,6 +754,8 @@
     CHIP_PRINTCLUSTER_PROXY_VALID_CLUSTER                                                                                          \
     CHIP_PRINTCLUSTER_BOOLEAN_STATE_CLUSTER                                                                                        \
     CHIP_PRINTCLUSTER_ICD_MANAGEMENT_CLUSTER                                                                                       \
+    CHIP_PRINTCLUSTER_TIMER_CLUSTER                                                                                                \
+    CHIP_PRINTCLUSTER_OVEN_MODE_CLUSTER                                                                                            \
     CHIP_PRINTCLUSTER_MODE_SELECT_CLUSTER                                                                                          \
     CHIP_PRINTCLUSTER_LAUNDRY_WASHER_MODE_CLUSTER                                                                                  \
     CHIP_PRINTCLUSTER_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER                                                 \
@@ -738,6 +774,9 @@
     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_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 50731135213eb3..277fc6724ccdc9 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
@@ -75,6 +75,8 @@
 | ProxyValid                                                          | 0x0044 |
 | BooleanState                                                        | 0x0045 |
 | IcdManagement                                                       | 0x0046 |
+| Timer                                                               | 0x0047 |
+| OvenMode                                                            | 0x0049 |
 | ModeSelect                                                          | 0x0050 |
 | LaundryWasherMode                                                   | 0x0051 |
 | RefrigeratorAndTemperatureControlledCabinetMode                     | 0x0052 |
@@ -93,6 +95,9 @@
 | RvcOperationalState                                                 | 0x0061 |
 | HepaFilterMonitoring                                                | 0x0071 |
 | ActivatedCarbonFilterMonitoring                                     | 0x0072 |
+| BooleanSensorConfiguration                                          | 0x0080 |
+| ValveConfigurationAndControl                                        | 0x0081 |
+| DemandResponseLoadControl                                           | 0x0096 |
 | DoorLock                                                            | 0x0101 |
 | WindowCovering                                                      | 0x0102 |
 | BarrierControl                                                      | 0x0103 |
@@ -503,7 +508,7 @@ class GroupsAddGroupIfIdentifying : public ClusterCommand
 | * NameSupport                                                       | 0x0004 |
 | * LastConfiguredBy                                                  | 0x0005 |
 | * SceneTableSize                                                    | 0x0006 |
-| * RemainingCapacity                                                 | 0x0007 |
+| * FabricSceneInfo                                                   | 0x0007 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -2201,6 +2206,8 @@ class ActionsDisableActionWithDuration : public ClusterCommand
 | * UniqueID                                                          | 0x0012 |
 | * CapabilityMinima                                                  | 0x0013 |
 | * ProductAppearance                                                 | 0x0014 |
+| * SpecificationVersion                                              | 0x0015 |
+| * MaxPathsPerInvoke                                                 | 0x0016 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -2734,6 +2741,7 @@ class GeneralCommissioningCommissioningComplete : public ClusterCommand
 | * RemoveNetwork                                                     |   0x04 |
 | * ConnectNetwork                                                    |   0x06 |
 | * ReorderNetwork                                                    |   0x08 |
+| * QueryIdentity                                                     |   0x09 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
 | * MaxNetworks                                                       | 0x0000 |
@@ -2808,6 +2816,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();
     }
 
@@ -2993,6 +3004,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 |
 |------------------------------------------------------------------------------|
@@ -4665,6 +4715,234 @@ class IcdManagementStayActiveRequest : public ClusterCommand
     chip::app::Clusters::IcdManagement::Commands::StayActiveRequest::Type mRequest;
 };
 
+/*----------------------------------------------------------------------------*\
+| Cluster Timer                                                       | 0x0047 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * SetTimer                                                          |   0x00 |
+| * ResetTimer                                                        |   0x01 |
+| * AddTime                                                           |   0x02 |
+| * ReduceTime                                                        |   0x03 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * SetTime                                                           | 0x0000 |
+| * TimeRemaining                                                     | 0x0001 |
+| * TimerState                                                        | 0x0002 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+\*----------------------------------------------------------------------------*/
+
+/*
+ * Command SetTimer
+ */
+class TimerSetTimer : public ClusterCommand
+{
+public:
+    TimerSetTimer(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("set-timer", credsIssuerConfig)
+    {
+        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::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));
+        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::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);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::Timer::Commands::SetTimer::Type mRequest;
+};
+
+/*
+ * Command ResetTimer
+ */
+class TimerResetTimer : public ClusterCommand
+{
+public:
+    TimerResetTimer(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("reset-timer", credsIssuerConfig)
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) override
+    {
+        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));
+        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::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);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::Timer::Commands::ResetTimer::Type mRequest;
+};
+
+/*
+ * Command AddTime
+ */
+class TimerAddTime : public ClusterCommand
+{
+public:
+    TimerAddTime(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("add-time", credsIssuerConfig)
+    {
+        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::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));
+        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::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);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::Timer::Commands::AddTime::Type mRequest;
+};
+
+/*
+ * Command ReduceTime
+ */
+class TimerReduceTime : public ClusterCommand
+{
+public:
+    TimerReduceTime(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("reduce-time", credsIssuerConfig)
+    {
+        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::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));
+        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::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);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::Timer::Commands::ReduceTime::Type mRequest;
+};
+
+/*----------------------------------------------------------------------------*\
+| Cluster OvenMode                                                    | 0x0049 |
+|------------------------------------------------------------------------------|
+| 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
+ */
+class OvenModeChangeToMode : public ClusterCommand
+{
+public:
+    OvenModeChangeToMode(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::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));
+        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::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);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::OvenMode::Commands::ChangeToMode::Type mRequest;
+};
+
 /*----------------------------------------------------------------------------*\
 | Cluster ModeSelect                                                  | 0x0050 |
 |------------------------------------------------------------------------------|
@@ -5668,20 +5946,487 @@ class RvcOperationalStatePause : public ClusterCommand
 };
 
 /*
- * Command Stop
+ * Command Stop
+ */
+class RvcOperationalStateStop : public ClusterCommand
+{
+public:
+    RvcOperationalStateStop(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("stop", 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::Stop::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::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;
+
+        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::Start::Type mRequest;
+};
+
+/*
+ * Command Resume
+ */
+class RvcOperationalStateResume : public ClusterCommand
+{
+public:
+    RvcOperationalStateResume(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::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));
+        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::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::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 ResetCondition
+ */
+class HepaFilterMonitoringResetCondition : public ClusterCommand
+{
+public:
+    HepaFilterMonitoringResetCondition(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("reset-condition", credsIssuerConfig)
+    {
+        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;
+
+        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::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);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    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 ResetCondition
+ */
+class ActivatedCarbonFilterMonitoringResetCondition : public ClusterCommand
+{
+public:
+    ActivatedCarbonFilterMonitoringResetCondition(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("reset-condition", credsIssuerConfig)
+    {
+        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;
+
+        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::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);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    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 SuppressRequest
+ */
+class BooleanSensorConfigurationSuppressRequest : public ClusterCommand
+{
+public:
+    BooleanSensorConfigurationSuppressRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("suppress-request", credsIssuerConfig)
+    {
+        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::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));
+        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::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);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    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 Open
+ */
+class ValveConfigurationAndControlOpen : public ClusterCommand
+{
+public:
+    ValveConfigurationAndControlOpen(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("open", credsIssuerConfig)
+    {
+        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::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));
+        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::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);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::ValveConfigurationAndControl::Commands::Open::Type mRequest;
+};
+
+/*
+ * Command Close
+ */
+class ValveConfigurationAndControlClose : public ClusterCommand
+{
+public:
+    ValveConfigurationAndControlClose(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("close", credsIssuerConfig)
+    {
+        ClusterCommand::AddArguments();
+    }
+
+    CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector<chip::EndpointId> endpointIds) 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, 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::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);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::ValveConfigurationAndControl::Commands::Close::Type mRequest;
+};
+
+/*
+ * Command SetLevel
+ */
+class ValveConfigurationAndControlSetLevel : public ClusterCommand
+{
+public:
+    ValveConfigurationAndControlSetLevel(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("set-level", credsIssuerConfig)
+    {
+        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::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));
+        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::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);
+
+        return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest);
+    }
+
+private:
+    chip::app::Clusters::ValveConfigurationAndControl::Commands::SetLevel::Type mRequest;
+};
+
+/*----------------------------------------------------------------------------*\
+| Cluster DemandResponseLoadControl                                   | 0x0096 |
+|------------------------------------------------------------------------------|
+| Commands:                                                           |        |
+| * RegisterLoadControlProgramRequest                                 |   0x00 |
+| * UnregisterLoadControlProgramRequest                               |   0x01 |
+| * AddLoadControlEventRequest                                        |   0x02 |
+| * RemoveLoadControlEventRequest                                     |   0x03 |
+| * ClearLoadControlEventsRequest                                     |   0x04 |
+|------------------------------------------------------------------------------|
+| Attributes:                                                         |        |
+| * DeviceClass                                                       | 0x0000 |
+| * LoadControlPrograms                                               | 0x0001 |
+| * NumberOfLoadControlPrograms                                       | 0x0002 |
+| * Events                                                            | 0x0003 |
+| * ActiveEvents                                                      | 0x0004 |
+| * NumberOfEventsPerProgram                                          | 0x0005 |
+| * NumberOfTransistions                                              | 0x0006 |
+| * DefaultRandomStart                                                | 0x0007 |
+| * DefaultRandomDuration                                             | 0x0008 |
+| * GeneratedCommandList                                              | 0xFFF8 |
+| * AcceptedCommandList                                               | 0xFFF9 |
+| * EventList                                                         | 0xFFFA |
+| * AttributeList                                                     | 0xFFFB |
+| * FeatureMap                                                        | 0xFFFC |
+| * ClusterRevision                                                   | 0xFFFD |
+|------------------------------------------------------------------------------|
+| Events:                                                             |        |
+| * LoadControlEventStatusChange                                      | 0x0000 |
+\*----------------------------------------------------------------------------*/
+
+/*
+ * Command RegisterLoadControlProgramRequest
  */
-class RvcOperationalStateStop : public ClusterCommand
+class DemandResponseLoadControlRegisterLoadControlProgramRequest : public ClusterCommand
 {
 public:
-    RvcOperationalStateStop(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("stop", credsIssuerConfig)
+    DemandResponseLoadControlRegisterLoadControlProgramRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("register-load-control-program-request", credsIssuerConfig),
+        mComplex_LoadControlProgram(&mRequest.loadControlProgram)
     {
+        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::RvcOperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Stop::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));
@@ -5690,8 +6435,9 @@ 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;
+        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);
@@ -5700,24 +6446,29 @@ class RvcOperationalStateStop : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::RvcOperationalState::Commands::Stop::Type mRequest;
+    chip::app::Clusters::DemandResponseLoadControl::Commands::RegisterLoadControlProgramRequest::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlProgramStruct::Type>
+        mComplex_LoadControlProgram;
 };
 
 /*
- * Command Start
+ * Command UnregisterLoadControlProgramRequest
  */
-class RvcOperationalStateStart : public ClusterCommand
+class DemandResponseLoadControlUnregisterLoadControlProgramRequest : public ClusterCommand
 {
 public:
-    RvcOperationalStateStart(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("start", credsIssuerConfig)
+    DemandResponseLoadControlUnregisterLoadControlProgramRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("unregister-load-control-program-request", credsIssuerConfig)
     {
+        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::RvcOperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Start::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));
@@ -5726,8 +6477,9 @@ class RvcOperationalStateStart : 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::Start::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);
@@ -5736,24 +6488,27 @@ class RvcOperationalStateStart : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::RvcOperationalState::Commands::Start::Type mRequest;
+    chip::app::Clusters::DemandResponseLoadControl::Commands::UnregisterLoadControlProgramRequest::Type mRequest;
 };
 
 /*
- * Command Resume
+ * Command AddLoadControlEventRequest
  */
-class RvcOperationalStateResume : public ClusterCommand
+class DemandResponseLoadControlAddLoadControlEventRequest : public ClusterCommand
 {
 public:
-    RvcOperationalStateResume(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("resume", credsIssuerConfig)
+    DemandResponseLoadControlAddLoadControlEventRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("add-load-control-event-request", credsIssuerConfig), mComplex_Event(&mRequest.event)
     {
+        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::RvcOperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Resume::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));
@@ -5762,8 +6517,9 @@ 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::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);
@@ -5772,48 +6528,29 @@ class RvcOperationalStateResume : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::RvcOperationalState::Commands::Resume::Type mRequest;
+    chip::app::Clusters::DemandResponseLoadControl::Commands::AddLoadControlEventRequest::Type mRequest;
+    TypedComplexArgument<chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::Type> mComplex_Event;
 };
 
-/*----------------------------------------------------------------------------*\
-| 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 ResetCondition
+ * Command RemoveLoadControlEventRequest
  */
-class HepaFilterMonitoringResetCondition : public ClusterCommand
+class DemandResponseLoadControlRemoveLoadControlEventRequest : public ClusterCommand
 {
 public:
-    HepaFilterMonitoringResetCondition(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("reset-condition", credsIssuerConfig)
+    DemandResponseLoadControlRemoveLoadControlEventRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("remove-load-control-event-request", credsIssuerConfig)
     {
+        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::HepaFilterMonitoring::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::HepaFilterMonitoring::Commands::ResetCondition::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));
@@ -5822,8 +6559,9 @@ 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::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);
@@ -5832,48 +6570,26 @@ class HepaFilterMonitoringResetCondition : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::HepaFilterMonitoring::Commands::ResetCondition::Type mRequest;
+    chip::app::Clusters::DemandResponseLoadControl::Commands::RemoveLoadControlEventRequest::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 ClearLoadControlEventsRequest
  */
-class ActivatedCarbonFilterMonitoringResetCondition : public ClusterCommand
+class DemandResponseLoadControlClearLoadControlEventsRequest : public ClusterCommand
 {
 public:
-    ActivatedCarbonFilterMonitoringResetCondition(CredentialIssuerCommands * credsIssuerConfig) :
-        ClusterCommand("reset-condition", credsIssuerConfig)
+    DemandResponseLoadControlClearLoadControlEventsRequest(CredentialIssuerCommands * credsIssuerConfig) :
+        ClusterCommand("clear-load-control-events-request", credsIssuerConfig)
     {
         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::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));
@@ -5882,8 +6598,9 @@ 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::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);
@@ -5892,7 +6609,7 @@ class ActivatedCarbonFilterMonitoringResetCondition : public ClusterCommand
     }
 
 private:
-    chip::app::Clusters::ActivatedCarbonFilterMonitoring::Commands::ResetCondition::Type mRequest;
+    chip::app::Clusters::DemandResponseLoadControl::Commands::ClearLoadControlEventsRequest::Type mRequest;
 };
 
 /*----------------------------------------------------------------------------*\
@@ -8810,6 +9527,7 @@ class ColorControlStepColorTemperature : public ClusterCommand
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
 | * MACAddress                                                        | 0x0000 |
+| * LinkLocalAddress                                                  | 0x0001 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -11796,7 +12514,7 @@ void registerClusterScenes(Commands & commands, CredentialIssuerCommands * creds
         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, "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),                        //
@@ -11819,8 +12537,9 @@ void registerClusterScenes(Commands & commands, CredentialIssuerCommands * creds
             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::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), //
@@ -11842,7 +12561,7 @@ void registerClusterScenes(Commands & commands, CredentialIssuerCommands * creds
         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, "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),                        //
@@ -12053,7 +12772,7 @@ void registerClusterLevelControl(Commands & commands, CredentialIssuerCommands *
                                               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>>>(
+        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), //
@@ -12587,6 +13306,8 @@ void registerClusterBasicInformation(Commands & commands, CredentialIssuerComman
         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),                          //
@@ -12636,6 +13357,10 @@ void registerClusterBasicInformation(Commands & commands, CredentialIssuerComman
             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), //
@@ -12671,6 +13396,8 @@ void registerClusterBasicInformation(Commands & commands, CredentialIssuerComman
         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),                          //
@@ -13366,6 +14093,7 @@ void registerClusterNetworkCommissioning(Commands & commands, CredentialIssuerCo
         make_unique<NetworkCommissioningRemoveNetwork>(credsIssuerConfig),            //
         make_unique<NetworkCommissioningConnectNetwork>(credsIssuerConfig),           //
         make_unique<NetworkCommissioningReorderNetwork>(credsIssuerConfig),           //
+        make_unique<NetworkCommissioningQueryIdentity>(credsIssuerConfig),            //
         //
         // Attributes
         //
@@ -15084,8 +15812,171 @@ 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<WriteAttribute<bool>>(Id, "state-value", 0, 1, Attributes::StateValue::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, "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, "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 registerClusterIcdManagement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::IcdManagement;
+
+    const char * clusterName = "IcdManagement";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        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, "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),                        //
+        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<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), //
+        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, "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),                        //
+        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 registerClusterTimer(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::Timer;
+
+    const char * clusterName = "Timer";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        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, "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),                        //
+        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<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), //
@@ -15100,7 +15991,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, "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),                        //
@@ -15110,43 +16003,32 @@ 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 registerClusterOvenMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
-    using namespace chip::app::Clusters::IcdManagement;
+    using namespace chip::app::Clusters::OvenMode;
 
-    const char * clusterName = "IcdManagement";
+    const char * clusterName = "OvenMode";
 
     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<OvenModeChangeToMode>(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, "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),                        //
@@ -15154,26 +16036,15 @@ 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::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), //
@@ -15186,19 +16057,12 @@ 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, "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),                        //
@@ -16575,6 +17439,287 @@ void registerClusterActivatedCarbonFilterMonitoring(Commands & commands, Credent
 
     commands.RegisterCluster(clusterName, clusterCommands);
 }
+void registerClusterBooleanSensorConfiguration(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::BooleanSensorConfiguration;
+
+    const char * clusterName = "BooleanSensorConfiguration";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        make_unique<ClusterCommand>(Id, credsIssuerConfig),                        //
+        make_unique<BooleanSensorConfigurationSuppressRequest>(credsIssuerConfig), //
+        //
+        // Attributes
+        //
+        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::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<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), //
+        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, "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),                        //
+        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, "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 registerClusterValveConfigurationAndControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::ValveConfigurationAndControl;
+
+    const char * clusterName = "ValveConfigurationAndControl";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        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, "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),                        //
+        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<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<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), //
+        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, "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),                        //
+        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, "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 registerClusterDemandResponseLoadControl(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
+{
+    using namespace chip::app::Clusters::DemandResponseLoadControl;
+
+    const char * clusterName = "DemandResponseLoadControl";
+
+    commands_list clusterCommands = {
+        //
+        // Commands
+        //
+        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, "device-class", Attributes::DeviceClass::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-transistions", Attributes::NumberOfTransistions::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<WriteAttribute<chip::BitMask<chip::app::Clusters::DemandResponseLoadControl::DeviceClassBitmap>>>(
+            Id, "device-class", 0, UINT32_MAX, Attributes::DeviceClass::Id, WriteCommandType::kForceWrite, 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-transistions", 0, UINT8_MAX, Attributes::NumberOfTransistions::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), //
+        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-class", Attributes::DeviceClass::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-transistions", Attributes::NumberOfTransistions::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, "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 registerClusterDoorLock(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
 {
     using namespace chip::app::Clusters::DoorLock;
@@ -17753,13 +18898,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), //
@@ -19822,6 +20968,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),                        //
@@ -19831,6 +20978,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), //
@@ -19846,6 +20995,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),                        //
@@ -20281,9 +21431,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), //
@@ -21895,6 +23045,8 @@ void registerClusters(Commands & commands, CredentialIssuerCommands * credsIssue
     registerClusterProxyValid(commands, credsIssuerConfig);
     registerClusterBooleanState(commands, credsIssuerConfig);
     registerClusterIcdManagement(commands, credsIssuerConfig);
+    registerClusterTimer(commands, credsIssuerConfig);
+    registerClusterOvenMode(commands, credsIssuerConfig);
     registerClusterModeSelect(commands, credsIssuerConfig);
     registerClusterLaundryWasherMode(commands, credsIssuerConfig);
     registerClusterRefrigeratorAndTemperatureControlledCabinetMode(commands, credsIssuerConfig);
@@ -21913,6 +23065,9 @@ void registerClusters(Commands & commands, CredentialIssuerCommands * credsIssue
     registerClusterRvcOperationalState(commands, credsIssuerConfig);
     registerClusterHepaFilterMonitoring(commands, credsIssuerConfig);
     registerClusterActivatedCarbonFilterMonitoring(commands, credsIssuerConfig);
+    registerClusterBooleanSensorConfiguration(commands, credsIssuerConfig);
+    registerClusterValveConfigurationAndControl(commands, credsIssuerConfig);
+    registerClusterDemandResponseLoadControl(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..b99220cfda2c75 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,377 @@ 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::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..39eeb0b1fb5cce 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,54 @@ 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::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 f12116bb6446ad..32355291d4c801 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,6 +1985,310 @@ CHIP_ERROR DataModelLogger::LogValue(
     return CHIP_NO_ERROR;
 }
 
+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("HeatingSource", indent + 1, value.heatingSource);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'HeatingSource'");
+            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::PowerSavingsControlStruct::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    {
+        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 '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("DutyCycle", indent + 1, value.dutyCycle);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'DutyCycle'");
+            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::AverageLoadControlStruct::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    {
+        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 '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("CoolingTempOffset", indent + 1, value.coolingTempOffset);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CoolingTempOffset'");
+            return err;
+        }
+    }
+    {
+        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 'HeatingtTempOffset'");
+            return err;
+        }
+    }
+    {
+        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 'CoolingTempSetpoint'");
+            return err;
+        }
+    }
+    {
+        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 'HeatingTempSetpoint'");
+            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::LoadControlEventTransitionStruct::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    {
+        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 'Duration'");
+            return err;
+        }
+    }
+    {
+        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 'Control'");
+            return err;
+        }
+    }
+    {
+        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 'TemperatureControl'");
+            return err;
+        }
+    }
+    {
+        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 'AverageLoadControl'");
+            return err;
+        }
+    }
+    {
+        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 'DutyCycleControl'");
+            return err;
+        }
+    }
+    {
+        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 '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;
+        }
+    }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+
+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("EventID", indent + 1, value.eventID);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'EventID'");
+            return err;
+        }
+    }
+    {
+        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 'ProgramID'");
+            return err;
+        }
+    }
+    {
+        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 'Control'");
+            return err;
+        }
+    }
+    {
+        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 'DeviceClass'");
+            return err;
+        }
+    }
+    {
+        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 'EnrollmentGroup'");
+            return err;
+        }
+    }
+    {
+        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 '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;
+        }
+    }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+
+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("ProgramID", indent + 1, value.programID);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ProgramID'");
+            return err;
+        }
+    }
+    {
+        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 'Name'");
+            return err;
+        }
+    }
+    {
+        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 'EnrollmentGroup'");
+            return err;
+        }
+    }
+    {
+        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 'RandomStartMinutes'");
+            return err;
+        }
+    }
+    {
+        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 'RandomDurationMinutes'");
+            return err;
+        }
+    }
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
                                      const chip::app::Clusters::DoorLock::Structs::CredentialStruct::DecodableType & value)
 {
@@ -3801,14 +4178,173 @@ 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 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 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 SmokeCoAlarm::Events::AllClear::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
+    DataModelLogger::LogString(indent, "}");
+
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     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 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 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 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 RvcOperationalState::Events::OperationCompletion::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("AlarmSeverityLevel", indent + 1, value.alarmSeverityLevel);
+        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 'AlarmSeverityLevel'");
+            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;
         }
     }
@@ -3817,14 +4353,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::InterconnectCOAlarm::DecodableType & value)
+                                     const BooleanSensorConfiguration::Events::AlarmsStateChanged::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("AlarmSeverityLevel", indent + 1, value.alarmSeverityLevel);
+        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 'AlarmSeverityLevel'");
+            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;
         }
     }
@@ -3832,7 +4376,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 BooleanSensorConfiguration::Events::SensorFault::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     DataModelLogger::LogString(indent, "}");
@@ -3840,134 +4385,118 @@ 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 ValveConfigurationAndControl::Events::ValveStateChanged::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Active", indent + 1, value.active);
+        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 'Active'");
+            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 ValveConfigurationAndControl::Events::ValveFault::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Inactive", indent + 1, value.inactive);
+        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 'Inactive'");
+            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 DemandResponseLoadControl::Events::LoadControlEventStatusChange::DecodableType & value)
+{
+    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("State", indent + 1, value.state);
+        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 'State'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'EventID'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("Mask", indent + 1, value.mask);
+        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 'Mask'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'TransitionIndex'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const OperationalState::Events::OperationalError::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("ErrorState", indent + 1, value.errorState);
+        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 'ErrorState'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Status'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const OperationalState::Events::OperationCompletion::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("CompletionErrorCode", indent + 1, value.completionErrorCode);
+        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 'CompletionErrorCode'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Criticality'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("TotalOperationalTime", indent + 1, value.totalOperationalTime);
+        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 'TotalOperationalTime'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'Control'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("PausedTime", indent + 1, value.pausedTime);
+        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 'PausedTime'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'TemperatureControl'");
             return err;
         }
     }
-    DataModelLogger::LogString(indent, "}");
-
-    return CHIP_NO_ERROR;
-}
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const RvcOperationalState::Events::OperationalError::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("ErrorState", indent + 1, value.errorState);
+        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 'ErrorState'");
+            DataModelLogger::LogString(indent + 1, "Event 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 RvcOperationalState::Events::OperationCompletion::DecodableType & value)
-{
-    DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("CompletionErrorCode", indent + 1, value.completionErrorCode);
+        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 'CompletionErrorCode'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'DutyCycleControl'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("TotalOperationalTime", indent + 1, value.totalOperationalTime);
+        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 'TotalOperationalTime'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'PowerSavingsControl'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = DataModelLogger::LogValue("PausedTime", indent + 1, value.pausedTime);
+        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 'PausedTime'");
+            DataModelLogger::LogString(indent + 1, "Event truncated due to invalid value for 'HeatingSourceControl'");
             return err;
         }
     }
@@ -4601,6 +5130,8 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t 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));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("clientIdentity", indent + 1, value.clientIdentity));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("possessionSignature", indent + 1, value.possessionSignature));
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
@@ -4614,6 +5145,15 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
+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)
 {
@@ -4702,6 +5242,15 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     DataModelLogger::LogString(indent, "}");
     return CHIP_NO_ERROR;
 }
+CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
+                                     const OvenMode::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 LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType & value)
 {
@@ -5220,10 +5769,10 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("SceneTableSize", 1, value);
         }
-        case Scenes::Attributes::RemainingCapacity::Id: {
-            uint8_t 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("RemainingCapacity", 1, value);
+            return DataModelLogger::LogValue("FabricSceneInfo", 1, value);
         }
         case Scenes::Attributes::GeneratedCommandList::Id: {
             chip::app::DataModel::DecodableList<chip::CommandId> value;
@@ -5404,7 +5953,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             return DataModelLogger::LogValue("MaxFrequency", 1, value);
         }
         case LevelControl::Attributes::Options::Id: {
-            chip::BitMask<chip::app::Clusters::LevelControl::LevelControlOptions> value;
+            chip::BitMask<chip::app::Clusters::LevelControl::OptionsBitmap> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("Options", 1, value);
         }
@@ -5914,6 +6463,16 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ProductAppearance", 1, value);
         }
+        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));
@@ -7924,42 +8483,171 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
         }
         }
-        break;
-    }
-    case BooleanState::Id: {
-        switch (path.mAttributeId)
-        {
-        case BooleanState::Attributes::StateValue::Id: {
-            bool 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("StateValue", 1, value);
+        }
+        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 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 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 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 BooleanState::Attributes::FeatureMap::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
+        }
+        case BooleanState::Attributes::ClusterRevision::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+        }
+        }
+        break;
+    }
+    case IcdManagement::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;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ActiveModeThreshold", 1, value);
+        }
+        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("RegisteredClients", 1, value);
+        }
+        case IcdManagement::Attributes::ICDCounter::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ICDCounter", 1, value);
+        }
+        case IcdManagement::Attributes::ClientsSupportedPerFabric::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ClientsSupportedPerFabric", 1, value);
+        }
+        case IcdManagement::Attributes::UserActiveModeTriggerHint::Id: {
+            chip::BitMask<chip::app::Clusters::IcdManagement::UserActiveModeTriggerBitmap> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("UserActiveModeTriggerHint", 1, value);
+        }
+        case IcdManagement::Attributes::UserActiveModeTriggerInstruction::Id: {
+            chip::CharSpan value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("UserActiveModeTriggerInstruction", 1, value);
+        }
+        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 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 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 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 IcdManagement::Attributes::FeatureMap::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
+        }
+        case IcdManagement::Attributes::ClusterRevision::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+        }
+        }
+        break;
+    }
+    case Timer::Id: {
+        switch (path.mAttributeId)
+        {
+        case Timer::Attributes::SetTime::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SetTime", 1, value);
+        }
+        case Timer::Attributes::TimeRemaining::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("TimeRemaining", 1, value);
+        }
+        case Timer::Attributes::TimerState::Id: {
+            chip::app::Clusters::Timer::TimerStatusEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("StateValue", 1, value);
+            return DataModelLogger::LogValue("TimerState", 1, value);
         }
-        case BooleanState::Attributes::GeneratedCommandList::Id: {
+        case Timer::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 Timer::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 Timer::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 Timer::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 Timer::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 Timer::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -7967,77 +8655,55 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
-    case IcdManagement::Id: {
+    case OvenMode::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;
-            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ActiveModeThreshold", 1, value);
-        }
-        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("RegisteredClients", 1, value);
-        }
-        case IcdManagement::Attributes::ICDCounter::Id: {
-            uint32_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("ICDCounter", 1, value);
+            return DataModelLogger::LogValue("SupportedModes", 1, value);
         }
-        case IcdManagement::Attributes::ClientsSupportedPerFabric::Id: {
-            uint16_t value;
+        case OvenMode::Attributes::CurrentMode::Id: {
+            uint8_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("ClientsSupportedPerFabric", 1, value);
+            return DataModelLogger::LogValue("CurrentMode", 1, value);
         }
-        case IcdManagement::Attributes::UserActiveModeTriggerHint::Id: {
-            chip::BitMask<chip::app::Clusters::IcdManagement::UserActiveModeTriggerBitmap> value;
+        case OvenMode::Attributes::StartUpMode::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UserActiveModeTriggerHint", 1, value);
+            return DataModelLogger::LogValue("StartUpMode", 1, value);
         }
-        case IcdManagement::Attributes::UserActiveModeTriggerInstruction::Id: {
-            chip::CharSpan value;
+        case OvenMode::Attributes::OnMode::Id: {
+            chip::app::DataModel::Nullable<uint8_t> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
-            return DataModelLogger::LogValue("UserActiveModeTriggerInstruction", 1, value);
+            return DataModelLogger::LogValue("OnMode", 1, value);
         }
-        case IcdManagement::Attributes::GeneratedCommandList::Id: {
+        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 IcdManagement::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 IcdManagement::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 IcdManagement::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 IcdManagement::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 IcdManagement::Attributes::ClusterRevision::Id: {
+        case OvenMode::Attributes::ClusterRevision::Id: {
             uint16_t value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ClusterRevision", 1, value);
@@ -9136,6 +9802,235 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         }
         break;
     }
+    case BooleanSensorConfiguration::Id: {
+        switch (path.mAttributeId)
+        {
+        case BooleanSensorConfiguration::Attributes::SensitivityLevel::Id: {
+            chip::app::Clusters::BooleanSensorConfiguration::SensitivityEnum value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("SensitivityLevel", 1, value);
+        }
+        case BooleanSensorConfiguration::Attributes::AlarmsActive::Id: {
+            chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AlarmsActive", 1, value);
+        }
+        case BooleanSensorConfiguration::Attributes::AlarmsSuppressed::Id: {
+            chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AlarmsSuppressed", 1, value);
+        }
+        case BooleanSensorConfiguration::Attributes::AlarmsEnabled::Id: {
+            chip::BitMask<chip::app::Clusters::BooleanSensorConfiguration::AlarmModeBitmap> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AlarmsEnabled", 1, value);
+        }
+        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 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 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 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 BooleanSensorConfiguration::Attributes::FeatureMap::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
+        }
+        case BooleanSensorConfiguration::Attributes::ClusterRevision::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+        }
+        }
+        break;
+    }
+    case ValveConfigurationAndControl::Id: {
+        switch (path.mAttributeId)
+        {
+        case ValveConfigurationAndControl::Attributes::OpenDuration::Id: {
+            chip::app::DataModel::Nullable<uint32_t> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OpenDuration", 1, 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("StartUpState", 1, value);
+        }
+        case ValveConfigurationAndControl::Attributes::CurrentLevel::Id: {
+            chip::app::DataModel::Nullable<chip::Percent> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("CurrentLevel", 1, value);
+        }
+        case ValveConfigurationAndControl::Attributes::TargetLevel::Id: {
+            chip::app::DataModel::Nullable<chip::Percent> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("TargetLevel", 1, value);
+        }
+        case ValveConfigurationAndControl::Attributes::OpenLevel::Id: {
+            chip::app::DataModel::Nullable<chip::Percent> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("OpenLevel", 1, value);
+        }
+        case ValveConfigurationAndControl::Attributes::ValveFault::Id: {
+            chip::BitMask<chip::app::Clusters::ValveConfigurationAndControl::ValveFaultBitmap> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ValveFault", 1, value);
+        }
+        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 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 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 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 ValveConfigurationAndControl::Attributes::FeatureMap::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
+        }
+        case ValveConfigurationAndControl::Attributes::ClusterRevision::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+        }
+        }
+        break;
+    }
+    case DemandResponseLoadControl::Id: {
+        switch (path.mAttributeId)
+        {
+        case DemandResponseLoadControl::Attributes::DeviceClass::Id: {
+            chip::BitMask<chip::app::Clusters::DemandResponseLoadControl::DeviceClassBitmap> value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("DeviceClass", 1, 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("LoadControlPrograms", 1, value);
+        }
+        case DemandResponseLoadControl::Attributes::NumberOfLoadControlPrograms::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("NumberOfLoadControlPrograms", 1, 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("Events", 1, value);
+        }
+        case DemandResponseLoadControl::Attributes::ActiveEvents::Id: {
+            chip::app::DataModel::DecodableList<
+                chip::app::Clusters::DemandResponseLoadControl::Structs::LoadControlEventStruct::DecodableType>
+                value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ActiveEvents", 1, value);
+        }
+        case DemandResponseLoadControl::Attributes::NumberOfEventsPerProgram::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("NumberOfEventsPerProgram", 1, value);
+        }
+        case DemandResponseLoadControl::Attributes::NumberOfTransistions::Id: {
+            uint8_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("NumberOfTransistions", 1, value);
+        }
+        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 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 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 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 DemandResponseLoadControl::Attributes::FeatureMap::Id: {
+            uint32_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("FeatureMap", 1, value);
+        }
+        case DemandResponseLoadControl::Attributes::ClusterRevision::Id: {
+            uint16_t value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ClusterRevision", 1, value);
+        }
+        }
+        break;
+    }
     case DoorLock::Id: {
         switch (path.mAttributeId)
         {
@@ -10116,17 +11011,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);
         }
@@ -11889,6 +12784,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));
@@ -12219,7 +13119,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);
         }
@@ -13809,6 +14709,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;
     }
@@ -13898,6 +14803,17 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa
         }
         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;
+    }
     case LaundryWasherMode::Id: {
         switch (path.mCommandId)
         {
@@ -14625,6 +15541,49 @@ CHIP_ERROR DataModelLogger::LogEvent(const chip::app::EventHeader & header, chip
         }
         break;
     }
+    case BooleanSensorConfiguration::Id: {
+        switch (header.mPath.mEventId)
+        {
+        case BooleanSensorConfiguration::Events::AlarmsStateChanged::Id: {
+            chip::app::Clusters::BooleanSensorConfiguration::Events::AlarmsStateChanged::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("AlarmsStateChanged", 1, value);
+        }
+        case BooleanSensorConfiguration::Events::SensorFault::Id: {
+            chip::app::Clusters::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: {
+            chip::app::Clusters::ValveConfigurationAndControl::Events::ValveStateChanged::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("ValveStateChanged", 1, value);
+        }
+        case ValveConfigurationAndControl::Events::ValveFault::Id: {
+            chip::app::Clusters::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: {
+            chip::app::Clusters::DemandResponseLoadControl::Events::LoadControlEventStatusChange::DecodableType value;
+            ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
+            return DataModelLogger::LogValue("LoadControlEventStatusChange", 1, value);
+        }
+        }
+        break;
+    }
     case DoorLock::Id: {
         switch (header.mPath.mEventId)
         {
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 6d2ccf1c0fbc68..6fcac4df641522 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,38 @@ 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::DoorLock::Structs::CredentialStruct::DecodableType & value);
 
@@ -353,6 +388,19 @@ 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::DoorLock::Events::DoorLockAlarm::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
@@ -458,6 +506,8 @@ 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,
@@ -480,6 +530,8 @@ 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::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
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 ffabd5c6ba9a12..a23de84bad8639 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,8 @@
 | ProxyValid                                                          | 0x0044 |
 | BooleanState                                                        | 0x0045 |
 | IcdManagement                                                       | 0x0046 |
+| Timer                                                               | 0x0047 |
+| OvenMode                                                            | 0x0049 |
 | ModeSelect                                                          | 0x0050 |
 | LaundryWasherMode                                                   | 0x0051 |
 | RefrigeratorAndTemperatureControlledCabinetMode                     | 0x0052 |
@@ -96,6 +98,9 @@
 | RvcOperationalState                                                 | 0x0061 |
 | HepaFilterMonitoring                                                | 0x0071 |
 | ActivatedCarbonFilterMonitoring                                     | 0x0072 |
+| BooleanSensorConfiguration                                          | 0x0080 |
+| ValveConfigurationAndControl                                        | 0x0081 |
+| DemandResponseLoadControl                                           | 0x0096 |
 | DoorLock                                                            | 0x0101 |
 | WindowCovering                                                      | 0x0102 |
 | BarrierControl                                                      | 0x0103 |
@@ -1897,7 +1902,7 @@ class SubscribeAttributeGroupsClusterRevision : public SubscribeAttribute {
 | * NameSupport                                                       | 0x0004 |
 | * LastConfiguredBy                                                  | 0x0005 |
 | * SceneTableSize                                                    | 0x0006 |
-| * RemainingCapacity                                                 | 0x0007 |
+| * FabricSceneInfo                                                   | 0x0007 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -3097,37 +3102,40 @@ class SubscribeAttributeScenesSceneTableSize : public SubscribeAttribute {
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
-#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);
@@ -3136,21 +3144,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);
@@ -3165,10 +3173,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 {
@@ -3181,8 +3189,6 @@ class SubscribeAttributeScenesRemainingCapacity : public SubscribeAttribute {
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-
 /*
  * Attribute GeneratedCommandList
  */
@@ -14381,6 +14387,8 @@ class SubscribeAttributeActionsClusterRevision : public SubscribeAttribute {
 | * UniqueID                                                          | 0x0012 |
 | * CapabilityMinima                                                  | 0x0013 |
 | * ProductAppearance                                                 | 0x0014 |
+| * SpecificationVersion                                              | 0x0015 |
+| * MaxPathsPerInvoke                                                 | 0x0016 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -16240,6 +16248,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
  */
@@ -25525,6 +25704,7 @@ class SubscribeAttributeGeneralCommissioningClusterRevision : public SubscribeAt
 | * RemoveNetwork                                                     |   0x04 |
 | * ConnectNetwork                                                    |   0x06 |
 | * ReorderNetwork                                                    |   0x08 |
+| * QueryIdentity                                                     |   0x09 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
 | * MaxNetworks                                                       | 0x0000 |
@@ -25626,6 +25806,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();
     }
 
@@ -25647,6 +25836,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--) {
@@ -25914,6 +26124,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
  */
@@ -39032,7 +39312,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();
     }
 
@@ -39047,6 +39329,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 {
@@ -39054,6 +39337,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--) {
@@ -39089,7 +39373,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();
     }
 
@@ -39104,6 +39390,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) {
@@ -39120,6 +39407,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--) {
@@ -39161,7 +39449,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();
     }
 
@@ -39176,6 +39466,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) {
@@ -39192,6 +39483,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--) {
@@ -39226,7 +39518,9 @@ class TimeSynchronizationSetDefaultNTP : public ClusterCommand {
     TimeSynchronizationSetDefaultNTP()
         : ClusterCommand("set-default-ntp")
     {
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("DefaultNTP", &mRequest.defaultNTP);
+#endif // MTR_ENABLE_PROVISIONAL
         ClusterCommand::AddArguments();
     }
 
@@ -39241,11 +39535,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--) {
@@ -48937,10 +49233,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();
     }
 
@@ -48955,14 +49259,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--) {
@@ -49002,8 +49314,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();
     }
 
@@ -49018,12 +49334,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--) {
@@ -50290,19 +50610,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 |
@@ -50313,328 +50634,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);
@@ -50643,25 +50879,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();
@@ -50672,10 +50908,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 {
@@ -50688,106 +50924,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();
@@ -50798,10 +50993,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 {
@@ -50814,106 +51009,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();
@@ -50924,10 +51078,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 {
@@ -50940,35 +51094,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);
@@ -50977,25 +51134,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();
@@ -51009,7 +51166,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 {
@@ -51022,35 +51179,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);
@@ -51059,25 +51219,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();
@@ -51091,7 +51251,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 {
@@ -51104,37 +51264,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);
@@ -51143,25 +51304,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();
@@ -51175,7 +51336,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 {
@@ -51189,36 +51350,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);
@@ -51227,25 +51389,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();
@@ -51259,7 +51421,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 {
@@ -51272,35 +51434,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);
@@ -51309,25 +51474,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();
@@ -51341,7 +51506,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 {
@@ -51354,35 +51519,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);
@@ -51391,25 +51559,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();
@@ -51423,7 +51591,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 {
@@ -51436,9 +51604,11 @@ class SubscribeAttributeModeSelectClusterRevision : public SubscribeAttribute {
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
+#endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster LaundryWasherMode                                           | 0x0051 |
+| Cluster OvenMode                                                    | 0x0049 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
 | * ChangeToMode                                                      |   0x00 |
@@ -51462,42 +51632,46 @@ class SubscribeAttributeModeSelectClusterRevision : public SubscribeAttribute {
 /*
  * Command ChangeToMode
  */
-class LaundryWasherModeChangeToMode : public ClusterCommand {
+class OvenModeChangeToMode : public ClusterCommand {
 public:
-    LaundryWasherModeChangeToMode()
+    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::LaundryWasherMode::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::LaundryWasherMode::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 = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRLaundryWasherModeClusterChangeToModeParams 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:
-                                                       ^(MTRLaundryWasherModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                       ^(MTROvenModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
                                                            NSLog(@"Values: %@", values);
                                                            if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::LaundryWasherMode::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::LaundryWasherMode::Commands::ChangeToModeResponse::Id;
+                                                               constexpr chip::CommandId responseId = chip::app::Clusters::OvenMode::Commands::ChangeToModeResponse::Id;
                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
                                                            }
                                                            if (responsesNeeded == 0) {
@@ -51509,7 +51683,7 @@ class LaundryWasherModeChangeToMode : public ClusterCommand {
     }
 
 private:
-    chip::app::Clusters::LaundryWasherMode::Commands::ChangeToMode::Type mRequest;
+    chip::app::Clusters::OvenMode::Commands::ChangeToMode::Type mRequest;
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
@@ -51519,32 +51693,32 @@ class LaundryWasherModeChangeToMode : public ClusterCommand {
 /*
  * Attribute SupportedModes
  */
-class ReadLaundryWasherModeSupportedModes : public ReadAttribute {
+class ReadOvenModeSupportedModes : public ReadAttribute {
 public:
-    ReadLaundryWasherModeSupportedModes()
+    ReadOvenModeSupportedModes()
         : ReadAttribute("supported-modes")
     {
     }
 
-    ~ReadLaundryWasherModeSupportedModes()
+    ~ReadOvenModeSupportedModes()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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(@"LaundryWasherMode.SupportedModes response %@", [value description]);
+            NSLog(@"OvenMode.SupportedModes response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode SupportedModes read Error", error);
+                LogNSError("OvenMode SupportedModes read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -51553,25 +51727,25 @@ class ReadLaundryWasherModeSupportedModes : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherModeSupportedModes : public SubscribeAttribute {
+class SubscribeAttributeOvenModeSupportedModes : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeSupportedModes()
+    SubscribeAttributeOvenModeSupportedModes()
         : SubscribeAttribute("supported-modes")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeSupportedModes()
+    ~SubscribeAttributeOvenModeSupportedModes()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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();
@@ -51585,7 +51759,7 @@ class SubscribeAttributeLaundryWasherModeSupportedModes : public SubscribeAttrib
         [cluster subscribeAttributeSupportedModesWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherMode.SupportedModes response %@", [value description]);
+                NSLog(@"OvenMode.SupportedModes response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -51604,32 +51778,32 @@ class SubscribeAttributeLaundryWasherModeSupportedModes : public SubscribeAttrib
 /*
  * Attribute CurrentMode
  */
-class ReadLaundryWasherModeCurrentMode : public ReadAttribute {
+class ReadOvenModeCurrentMode : public ReadAttribute {
 public:
-    ReadLaundryWasherModeCurrentMode()
+    ReadOvenModeCurrentMode()
         : ReadAttribute("current-mode")
     {
     }
 
-    ~ReadLaundryWasherModeCurrentMode()
+    ~ReadOvenModeCurrentMode()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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(@"LaundryWasherMode.CurrentMode response %@", [value description]);
+            NSLog(@"OvenMode.CurrentMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode CurrentMode read Error", error);
+                LogNSError("OvenMode CurrentMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -51638,25 +51812,25 @@ class ReadLaundryWasherModeCurrentMode : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherModeCurrentMode : public SubscribeAttribute {
+class SubscribeAttributeOvenModeCurrentMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeCurrentMode()
+    SubscribeAttributeOvenModeCurrentMode()
         : SubscribeAttribute("current-mode")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeCurrentMode()
+    ~SubscribeAttributeOvenModeCurrentMode()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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();
@@ -51670,7 +51844,7 @@ class SubscribeAttributeLaundryWasherModeCurrentMode : public SubscribeAttribute
         [cluster subscribeAttributeCurrentModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherMode.CurrentMode response %@", [value description]);
+                NSLog(@"OvenMode.CurrentMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -51689,32 +51863,32 @@ class SubscribeAttributeLaundryWasherModeCurrentMode : public SubscribeAttribute
 /*
  * Attribute StartUpMode
  */
-class ReadLaundryWasherModeStartUpMode : public ReadAttribute {
+class ReadOvenModeStartUpMode : public ReadAttribute {
 public:
-    ReadLaundryWasherModeStartUpMode()
+    ReadOvenModeStartUpMode()
         : ReadAttribute("start-up-mode")
     {
     }
 
-    ~ReadLaundryWasherModeStartUpMode()
+    ~ReadOvenModeStartUpMode()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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(@"LaundryWasherMode.StartUpMode response %@", [value description]);
+            NSLog(@"OvenMode.StartUpMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode StartUpMode read Error", error);
+                LogNSError("OvenMode StartUpMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -51723,9 +51897,9 @@ class ReadLaundryWasherModeStartUpMode : public ReadAttribute {
     }
 };
 
-class WriteLaundryWasherModeStartUpMode : public WriteAttribute {
+class WriteOvenModeStartUpMode : public WriteAttribute {
 public:
-    WriteLaundryWasherModeStartUpMode()
+    WriteOvenModeStartUpMode()
         : WriteAttribute("start-up-mode")
     {
         AddArgument("attr-name", "start-up-mode");
@@ -51733,18 +51907,18 @@ class WriteLaundryWasherModeStartUpMode : public WriteAttribute {
         WriteAttribute::AddArguments();
     }
 
-    ~WriteLaundryWasherModeStartUpMode()
+    ~WriteOvenModeStartUpMode()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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;
@@ -51755,7 +51929,7 @@ class WriteLaundryWasherModeStartUpMode : public WriteAttribute {
 
         [cluster writeAttributeStartUpModeWithValue:value params:params completion:^(NSError * _Nullable error) {
             if (error != nil) {
-                LogNSError("LaundryWasherMode StartUpMode write Error", error);
+                LogNSError("OvenMode StartUpMode write Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -51767,25 +51941,25 @@ class WriteLaundryWasherModeStartUpMode : public WriteAttribute {
     chip::app::DataModel::Nullable<uint8_t> mValue;
 };
 
-class SubscribeAttributeLaundryWasherModeStartUpMode : public SubscribeAttribute {
+class SubscribeAttributeOvenModeStartUpMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeStartUpMode()
+    SubscribeAttributeOvenModeStartUpMode()
         : SubscribeAttribute("start-up-mode")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeStartUpMode()
+    ~SubscribeAttributeOvenModeStartUpMode()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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();
@@ -51799,7 +51973,7 @@ class SubscribeAttributeLaundryWasherModeStartUpMode : public SubscribeAttribute
         [cluster subscribeAttributeStartUpModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherMode.StartUpMode response %@", [value description]);
+                NSLog(@"OvenMode.StartUpMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -51818,32 +51992,32 @@ class SubscribeAttributeLaundryWasherModeStartUpMode : public SubscribeAttribute
 /*
  * Attribute OnMode
  */
-class ReadLaundryWasherModeOnMode : public ReadAttribute {
+class ReadOvenModeOnMode : public ReadAttribute {
 public:
-    ReadLaundryWasherModeOnMode()
+    ReadOvenModeOnMode()
         : ReadAttribute("on-mode")
     {
     }
 
-    ~ReadLaundryWasherModeOnMode()
+    ~ReadOvenModeOnMode()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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(@"LaundryWasherMode.OnMode response %@", [value description]);
+            NSLog(@"OvenMode.OnMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode OnMode read Error", error);
+                LogNSError("OvenMode OnMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -51852,9 +52026,9 @@ class ReadLaundryWasherModeOnMode : public ReadAttribute {
     }
 };
 
-class WriteLaundryWasherModeOnMode : public WriteAttribute {
+class WriteOvenModeOnMode : public WriteAttribute {
 public:
-    WriteLaundryWasherModeOnMode()
+    WriteOvenModeOnMode()
         : WriteAttribute("on-mode")
     {
         AddArgument("attr-name", "on-mode");
@@ -51862,18 +52036,18 @@ class WriteLaundryWasherModeOnMode : public WriteAttribute {
         WriteAttribute::AddArguments();
     }
 
-    ~WriteLaundryWasherModeOnMode()
+    ~WriteOvenModeOnMode()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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;
@@ -51884,7 +52058,7 @@ class WriteLaundryWasherModeOnMode : public WriteAttribute {
 
         [cluster writeAttributeOnModeWithValue:value params:params completion:^(NSError * _Nullable error) {
             if (error != nil) {
-                LogNSError("LaundryWasherMode OnMode write Error", error);
+                LogNSError("OvenMode OnMode write Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -51896,25 +52070,25 @@ class WriteLaundryWasherModeOnMode : public WriteAttribute {
     chip::app::DataModel::Nullable<uint8_t> mValue;
 };
 
-class SubscribeAttributeLaundryWasherModeOnMode : public SubscribeAttribute {
+class SubscribeAttributeOvenModeOnMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeOnMode()
+    SubscribeAttributeOvenModeOnMode()
         : SubscribeAttribute("on-mode")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeOnMode()
+    ~SubscribeAttributeOvenModeOnMode()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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();
@@ -51928,7 +52102,7 @@ class SubscribeAttributeLaundryWasherModeOnMode : public SubscribeAttribute {
         [cluster subscribeAttributeOnModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherMode.OnMode response %@", [value description]);
+                NSLog(@"OvenMode.OnMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -51947,32 +52121,32 @@ class SubscribeAttributeLaundryWasherModeOnMode : public SubscribeAttribute {
 /*
  * Attribute GeneratedCommandList
  */
-class ReadLaundryWasherModeGeneratedCommandList : public ReadAttribute {
+class ReadOvenModeGeneratedCommandList : public ReadAttribute {
 public:
-    ReadLaundryWasherModeGeneratedCommandList()
+    ReadOvenModeGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadLaundryWasherModeGeneratedCommandList()
+    ~ReadOvenModeGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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(@"LaundryWasherMode.GeneratedCommandList response %@", [value description]);
+            NSLog(@"OvenMode.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode GeneratedCommandList read Error", error);
+                LogNSError("OvenMode GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -51981,25 +52155,25 @@ class ReadLaundryWasherModeGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherModeGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeOvenModeGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeGeneratedCommandList()
+    SubscribeAttributeOvenModeGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeGeneratedCommandList()
+    ~SubscribeAttributeOvenModeGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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();
@@ -52013,7 +52187,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(@"OvenMode.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -52032,32 +52206,32 @@ class SubscribeAttributeLaundryWasherModeGeneratedCommandList : public Subscribe
 /*
  * Attribute AcceptedCommandList
  */
-class ReadLaundryWasherModeAcceptedCommandList : public ReadAttribute {
+class ReadOvenModeAcceptedCommandList : public ReadAttribute {
 public:
-    ReadLaundryWasherModeAcceptedCommandList()
+    ReadOvenModeAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadLaundryWasherModeAcceptedCommandList()
+    ~ReadOvenModeAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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(@"LaundryWasherMode.AcceptedCommandList response %@", [value description]);
+            NSLog(@"OvenMode.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode AcceptedCommandList read Error", error);
+                LogNSError("OvenMode AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52066,25 +52240,25 @@ class ReadLaundryWasherModeAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherModeAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeOvenModeAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeAcceptedCommandList()
+    SubscribeAttributeOvenModeAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeAcceptedCommandList()
+    ~SubscribeAttributeOvenModeAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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();
@@ -52098,7 +52272,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(@"OvenMode.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -52117,32 +52291,32 @@ class SubscribeAttributeLaundryWasherModeAcceptedCommandList : public SubscribeA
 /*
  * Attribute EventList
  */
-class ReadLaundryWasherModeEventList : public ReadAttribute {
+class ReadOvenModeEventList : public ReadAttribute {
 public:
-    ReadLaundryWasherModeEventList()
+    ReadOvenModeEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadLaundryWasherModeEventList()
+    ~ReadOvenModeEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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(@"LaundryWasherMode.EventList response %@", [value description]);
+            NSLog(@"OvenMode.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode EventList read Error", error);
+                LogNSError("OvenMode EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52151,25 +52325,25 @@ class ReadLaundryWasherModeEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherModeEventList : public SubscribeAttribute {
+class SubscribeAttributeOvenModeEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeEventList()
+    SubscribeAttributeOvenModeEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeEventList()
+    ~SubscribeAttributeOvenModeEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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();
@@ -52183,7 +52357,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(@"OvenMode.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -52202,32 +52376,32 @@ class SubscribeAttributeLaundryWasherModeEventList : public SubscribeAttribute {
 /*
  * Attribute AttributeList
  */
-class ReadLaundryWasherModeAttributeList : public ReadAttribute {
+class ReadOvenModeAttributeList : public ReadAttribute {
 public:
-    ReadLaundryWasherModeAttributeList()
+    ReadOvenModeAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadLaundryWasherModeAttributeList()
+    ~ReadOvenModeAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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(@"LaundryWasherMode.AttributeList response %@", [value description]);
+            NSLog(@"OvenMode.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode AttributeList read Error", error);
+                LogNSError("OvenMode AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52236,25 +52410,25 @@ class ReadLaundryWasherModeAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherModeAttributeList : public SubscribeAttribute {
+class SubscribeAttributeOvenModeAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeAttributeList()
+    SubscribeAttributeOvenModeAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeAttributeList()
+    ~SubscribeAttributeOvenModeAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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();
@@ -52268,7 +52442,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(@"OvenMode.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -52287,32 +52461,32 @@ class SubscribeAttributeLaundryWasherModeAttributeList : public SubscribeAttribu
 /*
  * Attribute FeatureMap
  */
-class ReadLaundryWasherModeFeatureMap : public ReadAttribute {
+class ReadOvenModeFeatureMap : public ReadAttribute {
 public:
-    ReadLaundryWasherModeFeatureMap()
+    ReadOvenModeFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadLaundryWasherModeFeatureMap()
+    ~ReadOvenModeFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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(@"LaundryWasherMode.FeatureMap response %@", [value description]);
+            NSLog(@"OvenMode.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode FeatureMap read Error", error);
+                LogNSError("OvenMode FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52321,25 +52495,25 @@ class ReadLaundryWasherModeFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherModeFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeOvenModeFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeFeatureMap()
+    SubscribeAttributeOvenModeFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeFeatureMap()
+    ~SubscribeAttributeOvenModeFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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();
@@ -52353,7 +52527,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(@"OvenMode.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -52372,32 +52546,32 @@ class SubscribeAttributeLaundryWasherModeFeatureMap : public SubscribeAttribute
 /*
  * Attribute ClusterRevision
  */
-class ReadLaundryWasherModeClusterRevision : public ReadAttribute {
+class ReadOvenModeClusterRevision : public ReadAttribute {
 public:
-    ReadLaundryWasherModeClusterRevision()
+    ReadOvenModeClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadLaundryWasherModeClusterRevision()
+    ~ReadOvenModeClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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(@"LaundryWasherMode.ClusterRevision response %@", [value description]);
+            NSLog(@"OvenMode.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherMode ClusterRevision read Error", error);
+                LogNSError("OvenMode ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52406,25 +52580,25 @@ class ReadLaundryWasherModeClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherModeClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeOvenModeClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherModeClusterRevision()
+    SubscribeAttributeOvenModeClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherModeClusterRevision()
+    ~SubscribeAttributeOvenModeClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherMode 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();
@@ -52438,7 +52612,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(@"OvenMode.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -52453,18 +52627,19 @@ class SubscribeAttributeLaundryWasherModeClusterRevision : public SubscribeAttri
 
 #endif // MTR_ENABLE_PROVISIONAL
 #endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster RefrigeratorAndTemperatureControlledCabinetMode             | 0x0052 |
+| Cluster ModeSelect                                                  | 0x0050 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
 | * ChangeToMode                                                      |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * SupportedModes                                                    | 0x0000 |
-| * CurrentMode                                                       | 0x0001 |
-| * StartUpMode                                                       | 0x0002 |
-| * OnMode                                                            | 0x0003 |
+| * Description                                                       | 0x0000 |
+| * StandardNamespace                                                 | 0x0001 |
+| * SupportedModes                                                    | 0x0002 |
+| * CurrentMode                                                       | 0x0003 |
+| * StartUpMode                                                       | 0x0004 |
+| * OnMode                                                            | 0x0005 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -52475,13 +52650,12 @@ class SubscribeAttributeLaundryWasherModeClusterRevision : public SubscribeAttri
 | Events:                                                             |        |
 \*----------------------------------------------------------------------------*/
 
-#if MTR_ENABLE_PROVISIONAL
 /*
  * Command ChangeToMode
  */
-class RefrigeratorAndTemperatureControlledCabinetModeChangeToMode : public ClusterCommand {
+class ModeSelectChangeToMode : public ClusterCommand {
 public:
-    RefrigeratorAndTemperatureControlledCabinetModeChangeToMode()
+    ModeSelectChangeToMode()
         : ClusterCommand("change-to-mode")
     {
         AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
@@ -52490,32 +52664,26 @@ class RefrigeratorAndTemperatureControlledCabinetModeChangeToMode : public Clust
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeParams alloc] init];
+        __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:
-                                                       ^(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);
-                                                           }
+                                                       ^(NSError * _Nullable error) {
                                                            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);
+                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
                                                            }
                                                            if (responsesNeeded == 0) {
                                                                SetCommandExitStatus(mError);
@@ -52526,42 +52694,38 @@ class RefrigeratorAndTemperatureControlledCabinetModeChangeToMode : public Clust
     }
 
 private:
-    chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Type mRequest;
+    chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Type mRequest;
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-
-#if MTR_ENABLE_PROVISIONAL
-
 /*
- * Attribute SupportedModes
+ * Attribute Description
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeSupportedModes : public ReadAttribute {
+class ReadModeSelectDescription : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeSupportedModes()
-        : ReadAttribute("supported-modes")
+    ReadModeSelectDescription()
+        : ReadAttribute("description")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeSupportedModes()
+    ~ReadModeSelectDescription()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.SupportedModes 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("RefrigeratorAndTemperatureControlledCabinetMode SupportedModes read Error", error);
+                LogNSError("ModeSelect Description read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52570,25 +52734,25 @@ class ReadRefrigeratorAndTemperatureControlledCabinetModeSupportedModes : public
     }
 };
 
-class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSupportedModes : public SubscribeAttribute {
+class SubscribeAttributeModeSelectDescription : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSupportedModes()
-        : SubscribeAttribute("supported-modes")
+    SubscribeAttributeModeSelectDescription()
+        : SubscribeAttribute("description")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSupportedModes()
+    ~SubscribeAttributeModeSelectDescription()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode 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();
@@ -52599,10 +52763,10 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSupported
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSupportedModesWithParams:params
+        [cluster subscribeAttributeDescriptionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.SupportedModes 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 {
@@ -52615,38 +52779,35 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSupported
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-
 /*
- * Attribute CurrentMode
+ * Attribute StandardNamespace
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeCurrentMode : public ReadAttribute {
+class ReadModeSelectStandardNamespace : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeCurrentMode()
-        : ReadAttribute("current-mode")
+    ReadModeSelectStandardNamespace()
+        : ReadAttribute("standard-namespace")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeCurrentMode()
+    ~ReadModeSelectStandardNamespace()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.CurrentMode 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("RefrigeratorAndTemperatureControlledCabinetMode CurrentMode read Error", error);
+                LogNSError("ModeSelect StandardNamespace read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52655,25 +52816,25 @@ class ReadRefrigeratorAndTemperatureControlledCabinetModeCurrentMode : public Re
     }
 };
 
-class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeCurrentMode : public SubscribeAttribute {
+class SubscribeAttributeModeSelectStandardNamespace : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeCurrentMode()
-        : SubscribeAttribute("current-mode")
+    SubscribeAttributeModeSelectStandardNamespace()
+        : SubscribeAttribute("standard-namespace")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeCurrentMode()
+    ~SubscribeAttributeModeSelectStandardNamespace()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode 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();
@@ -52684,10 +52845,10 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeCurrentMo
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeCurrentModeWithParams:params
+        [cluster subscribeAttributeStandardNamespaceWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.CurrentMode response %@", [value description]);
+                NSLog(@"ModeSelect.StandardNamespace response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -52700,109 +52861,62 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeCurrentMo
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-
 /*
- * Attribute StartUpMode
+ * Attribute SupportedModes
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeStartUpMode : public ReadAttribute {
+class ReadModeSelectSupportedModes : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
-        : ReadAttribute("start-up-mode")
+    ReadModeSelectSupportedModes()
+        : ReadAttribute("supported-modes")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
+    ~ReadModeSelectSupportedModes()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeStartUpModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.StartUpMode response %@", [value description]);
+        __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("RefrigeratorAndTemperatureControlledCabinetMode StartUpMode read Error", error);
-                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteRefrigeratorAndTemperatureControlledCabinetModeStartUpMode : public WriteAttribute {
-public:
-    WriteRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
-        : WriteAttribute("start-up-mode")
-    {
-        AddArgument("attr-name", "start-up-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
-    {
-    }
-
-    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);
+                LogNSError("ModeSelect SupportedModes read 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 {
+class SubscribeAttributeModeSelectSupportedModes : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
-        : SubscribeAttribute("start-up-mode")
+    SubscribeAttributeModeSelectSupportedModes()
+        : SubscribeAttribute("supported-modes")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
+    ~SubscribeAttributeModeSelectSupportedModes()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode 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();
@@ -52813,10 +52927,10 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeStartUpMo
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeStartUpModeWithParams:params
+        [cluster subscribeAttributeSupportedModesWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.StartUpMode response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.SupportedModes response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -52829,38 +52943,35 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeStartUpMo
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-
 /*
- * Attribute OnMode
+ * Attribute CurrentMode
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeOnMode : public ReadAttribute {
+class ReadModeSelectCurrentMode : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeOnMode()
-        : ReadAttribute("on-mode")
+    ReadModeSelectCurrentMode()
+        : ReadAttribute("current-mode")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeOnMode()
+    ~ReadModeSelectCurrentMode()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.OnMode response %@", [value description]);
+        __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]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode OnMode read Error", error);
+                LogNSError("ModeSelect CurrentMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52869,39 +52980,247 @@ class ReadRefrigeratorAndTemperatureControlledCabinetModeOnMode : public ReadAtt
     }
 };
 
-class WriteRefrigeratorAndTemperatureControlledCabinetModeOnMode : public WriteAttribute {
+class SubscribeAttributeModeSelectCurrentMode : public SubscribeAttribute {
 public:
-    WriteRefrigeratorAndTemperatureControlledCabinetModeOnMode()
-        : WriteAttribute("on-mode")
+    SubscribeAttributeModeSelectCurrentMode()
+        : SubscribeAttribute("current-mode")
     {
-        AddArgument("attr-name", "on-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteRefrigeratorAndTemperatureControlledCabinetModeOnMode()
+    ~SubscribeAttributeModeSelectCurrentMode()
     {
     }
 
     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::ModeSelect::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::ModeSelect::Attributes::CurrentMode::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 = [[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()];
-        }
+        __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 subscribeAttributeCurrentModeWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.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;
+    }
+};
+
+/*
+ * Attribute StartUpMode
+ */
+class ReadModeSelectStartUpMode : public ReadAttribute {
+public:
+    ReadModeSelectStartUpMode()
+        : ReadAttribute("start-up-mode")
+    {
+    }
+
+    ~ReadModeSelectStartUpMode()
+    {
+    }
+
+    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 ") ReadAttribute (0x%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]);
+            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);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::DataModel::Nullable<uint8_t> mValue;
+};
+
+class SubscribeAttributeModeSelectStartUpMode : public SubscribeAttribute {
+public:
+    SubscribeAttributeModeSelectStartUpMode()
+        : SubscribeAttribute("start-up-mode")
+    {
+    }
+
+    ~SubscribeAttributeModeSelectStartUpMode()
+    {
+    }
+
+    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;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%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 subscribeAttributeStartUpModeWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ModeSelect.StartUpMode 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 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("RefrigeratorAndTemperatureControlledCabinetMode OnMode write Error", error);
+                LogNSError("ModeSelect OnMode write Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52913,25 +53232,25 @@ class WriteRefrigeratorAndTemperatureControlledCabinetModeOnMode : public WriteA
     chip::app::DataModel::Nullable<uint8_t> mValue;
 };
 
-class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeOnMode : public SubscribeAttribute {
+class SubscribeAttributeModeSelectOnMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeOnMode()
+    SubscribeAttributeModeSelectOnMode()
         : SubscribeAttribute("on-mode")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeOnMode()
+    ~SubscribeAttributeModeSelectOnMode()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode 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();
@@ -52945,7 +53264,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeOnMode :
         [cluster subscribeAttributeOnModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.OnMode response %@", [value description]);
+                NSLog(@"ModeSelect.OnMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -52958,38 +53277,35 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeOnMode :
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-
 /*
  * Attribute GeneratedCommandList
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList : public ReadAttribute {
+class ReadModeSelectGeneratedCommandList : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList()
+    ReadModeSelectGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList()
+    ~ReadModeSelectGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode 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(@"RefrigeratorAndTemperatureControlledCabinetMode.GeneratedCommandList response %@", [value description]);
+            NSLog(@"ModeSelect.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode GeneratedCommandList read Error", error);
+                LogNSError("ModeSelect GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -52998,25 +53314,25 @@ class ReadRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList :
     }
 };
 
-class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeModeSelectGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList()
+    SubscribeAttributeModeSelectGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList()
+    ~SubscribeAttributeModeSelectGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode 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();
@@ -53030,7 +53346,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeGenerated
         [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.GeneratedCommandList response %@", [value description]);
+                NSLog(@"ModeSelect.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53043,38 +53359,35 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeGenerated
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-
 /*
  * Attribute AcceptedCommandList
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList : public ReadAttribute {
+class ReadModeSelectAcceptedCommandList : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList()
+    ReadModeSelectAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList()
+    ~ReadModeSelectAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode 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(@"RefrigeratorAndTemperatureControlledCabinetMode.AcceptedCommandList response %@", [value description]);
+            NSLog(@"ModeSelect.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode AcceptedCommandList read Error", error);
+                LogNSError("ModeSelect AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53083,25 +53396,25 @@ class ReadRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList : p
     }
 };
 
-class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeModeSelectAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList()
+    SubscribeAttributeModeSelectAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList()
+    ~SubscribeAttributeModeSelectAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode 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();
@@ -53115,7 +53428,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAcceptedC
         [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.AcceptedCommandList response %@", [value description]);
+                NSLog(@"ModeSelect.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53128,38 +53441,37 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAcceptedC
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 
 /*
  * Attribute EventList
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeEventList : public ReadAttribute {
+class ReadModeSelectEventList : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeEventList()
+    ReadModeSelectEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeEventList()
+    ~ReadModeSelectEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode 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(@"RefrigeratorAndTemperatureControlledCabinetMode.EventList response %@", [value description]);
+            NSLog(@"ModeSelect.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode EventList read Error", error);
+                LogNSError("ModeSelect EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53168,25 +53480,25 @@ class ReadRefrigeratorAndTemperatureControlledCabinetModeEventList : public Read
     }
 };
 
-class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeEventList : public SubscribeAttribute {
+class SubscribeAttributeModeSelectEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeEventList()
+    SubscribeAttributeModeSelectEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeEventList()
+    ~SubscribeAttributeModeSelectEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode 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();
@@ -53200,7 +53512,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeEventList
         [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.EventList response %@", [value description]);
+                NSLog(@"ModeSelect.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53214,37 +53526,36 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeEventList
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
 
 /*
  * Attribute AttributeList
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeAttributeList : public ReadAttribute {
+class ReadModeSelectAttributeList : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeAttributeList()
+    ReadModeSelectAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeAttributeList()
+    ~ReadModeSelectAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode 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(@"RefrigeratorAndTemperatureControlledCabinetMode.AttributeList response %@", [value description]);
+            NSLog(@"ModeSelect.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode AttributeList read Error", error);
+                LogNSError("ModeSelect AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53253,25 +53564,25 @@ class ReadRefrigeratorAndTemperatureControlledCabinetModeAttributeList : public
     }
 };
 
-class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAttributeList : public SubscribeAttribute {
+class SubscribeAttributeModeSelectAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAttributeList()
+    SubscribeAttributeModeSelectAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAttributeList()
+    ~SubscribeAttributeModeSelectAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode 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();
@@ -53285,7 +53596,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAttribute
         [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.AttributeList response %@", [value description]);
+                NSLog(@"ModeSelect.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53298,38 +53609,35 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAttribute
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-
 /*
  * Attribute FeatureMap
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeFeatureMap : public ReadAttribute {
+class ReadModeSelectFeatureMap : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeFeatureMap()
+    ReadModeSelectFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeFeatureMap()
+    ~ReadModeSelectFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode 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(@"RefrigeratorAndTemperatureControlledCabinetMode.FeatureMap response %@", [value description]);
+            NSLog(@"ModeSelect.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode FeatureMap read Error", error);
+                LogNSError("ModeSelect FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53338,25 +53646,25 @@ class ReadRefrigeratorAndTemperatureControlledCabinetModeFeatureMap : public Rea
     }
 };
 
-class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeModeSelectFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeFeatureMap()
+    SubscribeAttributeModeSelectFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeFeatureMap()
+    ~SubscribeAttributeModeSelectFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode 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();
@@ -53370,7 +53678,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeFeatureMa
         [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.FeatureMap response %@", [value description]);
+                NSLog(@"ModeSelect.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53383,38 +53691,35 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeFeatureMa
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-
 /*
  * Attribute ClusterRevision
  */
-class ReadRefrigeratorAndTemperatureControlledCabinetModeClusterRevision : public ReadAttribute {
+class ReadModeSelectClusterRevision : public ReadAttribute {
 public:
-    ReadRefrigeratorAndTemperatureControlledCabinetModeClusterRevision()
+    ReadModeSelectClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadRefrigeratorAndTemperatureControlledCabinetModeClusterRevision()
+    ~ReadModeSelectClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode 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(@"RefrigeratorAndTemperatureControlledCabinetMode.ClusterRevision response %@", [value description]);
+            NSLog(@"ModeSelect.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode ClusterRevision read Error", error);
+                LogNSError("ModeSelect ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53423,25 +53728,25 @@ class ReadRefrigeratorAndTemperatureControlledCabinetModeClusterRevision : publi
     }
 };
 
-class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeModeSelectClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeClusterRevision()
+    SubscribeAttributeModeSelectClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeClusterRevision()
+    ~SubscribeAttributeModeSelectClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode 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();
@@ -53455,7 +53760,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeClusterRe
         [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.ClusterRevision response %@", [value description]);
+                NSLog(@"ModeSelect.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53468,19 +53773,18 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeClusterRe
     }
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster LaundryWasherControls                                       | 0x0053 |
+| Cluster LaundryWasherMode                                           | 0x0051 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
+| * ChangeToMode                                                      |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * SpinSpeeds                                                        | 0x0000 |
-| * SpinSpeedCurrent                                                  | 0x0001 |
-| * NumberOfRinses                                                    | 0x0002 |
-| * SupportedRinses                                                   | 0x0003 |
+| * SupportedModes                                                    | 0x0000 |
+| * CurrentMode                                                       | 0x0001 |
+| * StartUpMode                                                       | 0x0002 |
+| * OnMode                                                            | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -53491,37 +53795,97 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeClusterRe
 | Events:                                                             |        |
 \*----------------------------------------------------------------------------*/
 
+#if MTR_ENABLE_PROVISIONAL
+/*
+ * Command ChangeToMode
+ */
+class LaundryWasherModeChangeToMode : public ClusterCommand {
+public:
+    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::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 = [[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:
+                                                       ^(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);
+                                                           }
+                                                       }];
+        }
+        return CHIP_NO_ERROR;
+    }
+
+private:
+    chip::app::Clusters::LaundryWasherMode::Commands::ChangeToMode::Type mRequest;
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute SpinSpeeds
+ * Attribute SupportedModes
  */
-class ReadLaundryWasherControlsSpinSpeeds : public ReadAttribute {
+class ReadLaundryWasherModeSupportedModes : public ReadAttribute {
 public:
-    ReadLaundryWasherControlsSpinSpeeds()
-        : ReadAttribute("spin-speeds")
+    ReadLaundryWasherModeSupportedModes()
+        : ReadAttribute("supported-modes")
     {
     }
 
-    ~ReadLaundryWasherControlsSpinSpeeds()
+    ~ReadLaundryWasherModeSupportedModes()
     {
     }
 
     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::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 = [[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 = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LaundryWasherMode.SupportedModes response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherControls SpinSpeeds read Error", error);
+                LogNSError("LaundryWasherMode SupportedModes read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53530,25 +53894,25 @@ class ReadLaundryWasherControlsSpinSpeeds : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherControlsSpinSpeeds : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherModeSupportedModes : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsSpinSpeeds()
-        : SubscribeAttribute("spin-speeds")
+    SubscribeAttributeLaundryWasherModeSupportedModes()
+        : SubscribeAttribute("supported-modes")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherControlsSpinSpeeds()
+    ~SubscribeAttributeLaundryWasherModeSupportedModes()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherControls 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();
@@ -53559,10 +53923,10 @@ class SubscribeAttributeLaundryWasherControlsSpinSpeeds : public SubscribeAttrib
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSpinSpeedsWithParams:params
+        [cluster subscribeAttributeSupportedModesWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.SpinSpeeds response %@", [value description]);
+                NSLog(@"LaundryWasherMode.SupportedModes response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53579,105 +53943,61 @@ class SubscribeAttributeLaundryWasherControlsSpinSpeeds : public SubscribeAttrib
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute SpinSpeedCurrent
+ * Attribute CurrentMode
  */
-class ReadLaundryWasherControlsSpinSpeedCurrent : public ReadAttribute {
+class ReadLaundryWasherModeCurrentMode : public ReadAttribute {
 public:
-    ReadLaundryWasherControlsSpinSpeedCurrent()
-        : ReadAttribute("spin-speed-current")
+    ReadLaundryWasherModeCurrentMode()
+        : ReadAttribute("current-mode")
     {
     }
 
-    ~ReadLaundryWasherControlsSpinSpeedCurrent()
+    ~ReadLaundryWasherModeCurrentMode()
     {
     }
 
     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::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 = [[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 = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LaundryWasherMode.CurrentMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherControls SpinSpeedCurrent read Error", error);
-                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class WriteLaundryWasherControlsSpinSpeedCurrent : public WriteAttribute {
-public:
-    WriteLaundryWasherControlsSpinSpeedCurrent()
-        : WriteAttribute("spin-speed-current")
-    {
-        AddArgument("attr-name", "spin-speed-current");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
-    }
-
-    ~WriteLaundryWasherControlsSpinSpeedCurrent()
-    {
-    }
-
-    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;
-
-        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);
+                LogNSError("LaundryWasherMode CurrentMode read 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 {
+class SubscribeAttributeLaundryWasherModeCurrentMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsSpinSpeedCurrent()
-        : SubscribeAttribute("spin-speed-current")
+    SubscribeAttributeLaundryWasherModeCurrentMode()
+        : SubscribeAttribute("current-mode")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherControlsSpinSpeedCurrent()
+    ~SubscribeAttributeLaundryWasherModeCurrentMode()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherControls 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();
@@ -53688,10 +54008,10 @@ class SubscribeAttributeLaundryWasherControlsSpinSpeedCurrent : public Subscribe
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSpinSpeedCurrentWithParams:params
+        [cluster subscribeAttributeCurrentModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.SpinSpeedCurrent response %@", [value description]);
+                NSLog(@"LaundryWasherMode.CurrentMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53708,34 +54028,34 @@ class SubscribeAttributeLaundryWasherControlsSpinSpeedCurrent : public Subscribe
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute NumberOfRinses
+ * Attribute StartUpMode
  */
-class ReadLaundryWasherControlsNumberOfRinses : public ReadAttribute {
+class ReadLaundryWasherModeStartUpMode : public ReadAttribute {
 public:
-    ReadLaundryWasherControlsNumberOfRinses()
-        : ReadAttribute("number-of-rinses")
+    ReadLaundryWasherModeStartUpMode()
+        : ReadAttribute("start-up-mode")
     {
     }
 
-    ~ReadLaundryWasherControlsNumberOfRinses()
+    ~ReadLaundryWasherModeStartUpMode()
     {
     }
 
     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::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 = [[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 = [[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("LaundryWasherControls NumberOfRinses read Error", error);
+                LogNSError("LaundryWasherMode StartUpMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53744,36 +54064,39 @@ class ReadLaundryWasherControlsNumberOfRinses : public ReadAttribute {
     }
 };
 
-class WriteLaundryWasherControlsNumberOfRinses : public WriteAttribute {
+class WriteLaundryWasherModeStartUpMode : public WriteAttribute {
 public:
-    WriteLaundryWasherControlsNumberOfRinses()
-        : WriteAttribute("number-of-rinses")
+    WriteLaundryWasherModeStartUpMode()
+        : WriteAttribute("start-up-mode")
     {
-        AddArgument("attr-name", "number-of-rinses");
+        AddArgument("attr-name", "start-up-mode");
         AddArgument("attr-value", 0, UINT8_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteLaundryWasherControlsNumberOfRinses()
+    ~WriteLaundryWasherModeStartUpMode()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherControls 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;
-        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
+        NSNumber * _Nullable value = nil;
+        if (!mValue.IsNull()) {
+            value = [NSNumber numberWithUnsignedChar:mValue.Value()];
+        }
 
-        [cluster writeAttributeNumberOfRinsesWithValue:value params:params completion:^(NSError * _Nullable error) {
+        [cluster writeAttributeStartUpModeWithValue:value params:params completion:^(NSError * _Nullable error) {
             if (error != nil) {
-                LogNSError("LaundryWasherControls NumberOfRinses write Error", error);
+                LogNSError("LaundryWasherMode StartUpMode write Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53782,28 +54105,28 @@ class WriteLaundryWasherControlsNumberOfRinses : public WriteAttribute {
     }
 
 private:
-    uint8_t mValue;
+    chip::app::DataModel::Nullable<uint8_t> mValue;
 };
 
-class SubscribeAttributeLaundryWasherControlsNumberOfRinses : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherModeStartUpMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsNumberOfRinses()
-        : SubscribeAttribute("number-of-rinses")
+    SubscribeAttributeLaundryWasherModeStartUpMode()
+        : SubscribeAttribute("start-up-mode")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherControlsNumberOfRinses()
+    ~SubscribeAttributeLaundryWasherModeStartUpMode()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherControls 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();
@@ -53814,10 +54137,10 @@ class SubscribeAttributeLaundryWasherControlsNumberOfRinses : public SubscribeAt
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeNumberOfRinsesWithParams:params
+        [cluster subscribeAttributeStartUpModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.NumberOfRinses response %@", [value description]);
+                NSLog(@"LaundryWasherMode.StartUpMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53834,34 +54157,34 @@ class SubscribeAttributeLaundryWasherControlsNumberOfRinses : public SubscribeAt
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute SupportedRinses
+ * Attribute OnMode
  */
-class ReadLaundryWasherControlsSupportedRinses : public ReadAttribute {
+class ReadLaundryWasherModeOnMode : public ReadAttribute {
 public:
-    ReadLaundryWasherControlsSupportedRinses()
-        : ReadAttribute("supported-rinses")
+    ReadLaundryWasherModeOnMode()
+        : ReadAttribute("on-mode")
     {
     }
 
-    ~ReadLaundryWasherControlsSupportedRinses()
+    ~ReadLaundryWasherModeOnMode()
     {
     }
 
     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::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 = [[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 = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"LaundryWasherMode.OnMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherControls SupportedRinses read Error", error);
+                LogNSError("LaundryWasherMode OnMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53870,25 +54193,69 @@ class ReadLaundryWasherControlsSupportedRinses : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherControlsSupportedRinses : public SubscribeAttribute {
+class WriteLaundryWasherModeOnMode : public WriteAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsSupportedRinses()
-        : SubscribeAttribute("supported-rinses")
+    WriteLaundryWasherModeOnMode()
+        : WriteAttribute("on-mode")
     {
+        AddArgument("attr-name", "on-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeLaundryWasherControlsSupportedRinses()
+    ~WriteLaundryWasherModeOnMode()
     {
     }
 
     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::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 = [[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 writeAttributeOnModeWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("LaundryWasherMode 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 SubscribeAttributeLaundryWasherModeOnMode : public SubscribeAttribute {
+public:
+    SubscribeAttributeLaundryWasherModeOnMode()
+        : SubscribeAttribute("on-mode")
+    {
+    }
+
+    ~SubscribeAttributeLaundryWasherModeOnMode()
+    {
+    }
+
+    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;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%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 = [[MTRBaseClusterLaundryWasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -53899,10 +54266,10 @@ class SubscribeAttributeLaundryWasherControlsSupportedRinses : public SubscribeA
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSupportedRinsesWithParams:params
+        [cluster subscribeAttributeOnModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.SupportedRinses response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LaundryWasherMode.OnMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -53921,32 +54288,32 @@ class SubscribeAttributeLaundryWasherControlsSupportedRinses : public SubscribeA
 /*
  * Attribute GeneratedCommandList
  */
-class ReadLaundryWasherControlsGeneratedCommandList : public ReadAttribute {
+class ReadLaundryWasherModeGeneratedCommandList : public ReadAttribute {
 public:
-    ReadLaundryWasherControlsGeneratedCommandList()
+    ReadLaundryWasherModeGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadLaundryWasherControlsGeneratedCommandList()
+    ~ReadLaundryWasherModeGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherControls 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(@"LaundryWasherControls.GeneratedCommandList response %@", [value description]);
+            NSLog(@"LaundryWasherMode.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherControls GeneratedCommandList read Error", error);
+                LogNSError("LaundryWasherMode GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -53955,25 +54322,25 @@ class ReadLaundryWasherControlsGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherControlsGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherModeGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsGeneratedCommandList()
+    SubscribeAttributeLaundryWasherModeGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherControlsGeneratedCommandList()
+    ~SubscribeAttributeLaundryWasherModeGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherControls 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();
@@ -53987,7 +54354,7 @@ class SubscribeAttributeLaundryWasherControlsGeneratedCommandList : public Subsc
         [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.GeneratedCommandList response %@", [value description]);
+                NSLog(@"LaundryWasherMode.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54006,32 +54373,32 @@ class SubscribeAttributeLaundryWasherControlsGeneratedCommandList : public Subsc
 /*
  * Attribute AcceptedCommandList
  */
-class ReadLaundryWasherControlsAcceptedCommandList : public ReadAttribute {
+class ReadLaundryWasherModeAcceptedCommandList : public ReadAttribute {
 public:
-    ReadLaundryWasherControlsAcceptedCommandList()
+    ReadLaundryWasherModeAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadLaundryWasherControlsAcceptedCommandList()
+    ~ReadLaundryWasherModeAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherControls 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(@"LaundryWasherControls.AcceptedCommandList response %@", [value description]);
+            NSLog(@"LaundryWasherMode.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherControls AcceptedCommandList read Error", error);
+                LogNSError("LaundryWasherMode AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54040,25 +54407,25 @@ class ReadLaundryWasherControlsAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherControlsAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherModeAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsAcceptedCommandList()
+    SubscribeAttributeLaundryWasherModeAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherControlsAcceptedCommandList()
+    ~SubscribeAttributeLaundryWasherModeAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherControls 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();
@@ -54072,7 +54439,7 @@ class SubscribeAttributeLaundryWasherControlsAcceptedCommandList : public Subscr
         [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.AcceptedCommandList response %@", [value description]);
+                NSLog(@"LaundryWasherMode.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54091,32 +54458,32 @@ class SubscribeAttributeLaundryWasherControlsAcceptedCommandList : public Subscr
 /*
  * Attribute EventList
  */
-class ReadLaundryWasherControlsEventList : public ReadAttribute {
+class ReadLaundryWasherModeEventList : public ReadAttribute {
 public:
-    ReadLaundryWasherControlsEventList()
+    ReadLaundryWasherModeEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadLaundryWasherControlsEventList()
+    ~ReadLaundryWasherModeEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherControls 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(@"LaundryWasherControls.EventList response %@", [value description]);
+            NSLog(@"LaundryWasherMode.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherControls EventList read Error", error);
+                LogNSError("LaundryWasherMode EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54125,25 +54492,25 @@ class ReadLaundryWasherControlsEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherControlsEventList : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherModeEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsEventList()
+    SubscribeAttributeLaundryWasherModeEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherControlsEventList()
+    ~SubscribeAttributeLaundryWasherModeEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherControls 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();
@@ -54157,7 +54524,7 @@ class SubscribeAttributeLaundryWasherControlsEventList : public SubscribeAttribu
         [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.EventList response %@", [value description]);
+                NSLog(@"LaundryWasherMode.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54176,32 +54543,32 @@ class SubscribeAttributeLaundryWasherControlsEventList : public SubscribeAttribu
 /*
  * Attribute AttributeList
  */
-class ReadLaundryWasherControlsAttributeList : public ReadAttribute {
+class ReadLaundryWasherModeAttributeList : public ReadAttribute {
 public:
-    ReadLaundryWasherControlsAttributeList()
+    ReadLaundryWasherModeAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadLaundryWasherControlsAttributeList()
+    ~ReadLaundryWasherModeAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherControls 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(@"LaundryWasherControls.AttributeList response %@", [value description]);
+            NSLog(@"LaundryWasherMode.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherControls AttributeList read Error", error);
+                LogNSError("LaundryWasherMode AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54210,25 +54577,25 @@ class ReadLaundryWasherControlsAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherControlsAttributeList : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherModeAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsAttributeList()
+    SubscribeAttributeLaundryWasherModeAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherControlsAttributeList()
+    ~SubscribeAttributeLaundryWasherModeAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherControls 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();
@@ -54242,7 +54609,7 @@ class SubscribeAttributeLaundryWasherControlsAttributeList : public SubscribeAtt
         [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.AttributeList response %@", [value description]);
+                NSLog(@"LaundryWasherMode.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54261,32 +54628,32 @@ class SubscribeAttributeLaundryWasherControlsAttributeList : public SubscribeAtt
 /*
  * Attribute FeatureMap
  */
-class ReadLaundryWasherControlsFeatureMap : public ReadAttribute {
+class ReadLaundryWasherModeFeatureMap : public ReadAttribute {
 public:
-    ReadLaundryWasherControlsFeatureMap()
+    ReadLaundryWasherModeFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadLaundryWasherControlsFeatureMap()
+    ~ReadLaundryWasherModeFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherControls 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(@"LaundryWasherControls.FeatureMap response %@", [value description]);
+            NSLog(@"LaundryWasherMode.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherControls FeatureMap read Error", error);
+                LogNSError("LaundryWasherMode FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54295,25 +54662,25 @@ class ReadLaundryWasherControlsFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherControlsFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherModeFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsFeatureMap()
+    SubscribeAttributeLaundryWasherModeFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherControlsFeatureMap()
+    ~SubscribeAttributeLaundryWasherModeFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherControls 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();
@@ -54327,7 +54694,7 @@ class SubscribeAttributeLaundryWasherControlsFeatureMap : public SubscribeAttrib
         [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.FeatureMap response %@", [value description]);
+                NSLog(@"LaundryWasherMode.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54346,32 +54713,32 @@ class SubscribeAttributeLaundryWasherControlsFeatureMap : public SubscribeAttrib
 /*
  * Attribute ClusterRevision
  */
-class ReadLaundryWasherControlsClusterRevision : public ReadAttribute {
+class ReadLaundryWasherModeClusterRevision : public ReadAttribute {
 public:
-    ReadLaundryWasherControlsClusterRevision()
+    ReadLaundryWasherModeClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadLaundryWasherControlsClusterRevision()
+    ~ReadLaundryWasherModeClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherControls 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(@"LaundryWasherControls.ClusterRevision response %@", [value description]);
+            NSLog(@"LaundryWasherMode.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("LaundryWasherControls ClusterRevision read Error", error);
+                LogNSError("LaundryWasherMode ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54380,25 +54747,25 @@ class ReadLaundryWasherControlsClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeLaundryWasherControlsClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherModeClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeLaundryWasherControlsClusterRevision()
+    SubscribeAttributeLaundryWasherModeClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeLaundryWasherControlsClusterRevision()
+    ~SubscribeAttributeLaundryWasherModeClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterLaundryWasherControls 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();
@@ -54412,7 +54779,7 @@ class SubscribeAttributeLaundryWasherControlsClusterRevision : public SubscribeA
         [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"LaundryWasherControls.ClusterRevision response %@", [value description]);
+                NSLog(@"LaundryWasherMode.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54429,7 +54796,7 @@ class SubscribeAttributeLaundryWasherControlsClusterRevision : public SubscribeA
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster RvcRunMode                                                  | 0x0054 |
+| Cluster RefrigeratorAndTemperatureControlledCabinetMode             | 0x0052 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
 | * ChangeToMode                                                      |   0x00 |
@@ -54437,6 +54804,7 @@ class SubscribeAttributeLaundryWasherControlsClusterRevision : public SubscribeA
 | Attributes:                                                         |        |
 | * SupportedModes                                                    | 0x0000 |
 | * CurrentMode                                                       | 0x0001 |
+| * StartUpMode                                                       | 0x0002 |
 | * OnMode                                                            | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
@@ -54452,42 +54820,46 @@ class SubscribeAttributeLaundryWasherControlsClusterRevision : public SubscribeA
 /*
  * Command ChangeToMode
  */
-class RvcRunModeChangeToMode : public ClusterCommand {
+class RefrigeratorAndTemperatureControlledCabinetModeChangeToMode : public ClusterCommand {
 public:
-    RvcRunModeChangeToMode()
+    RefrigeratorAndTemperatureControlledCabinetModeChangeToMode()
         : 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::RvcRunMode::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcRunMode::Commands::ChangeToMode::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 = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRRVCRunModeClusterChangeToModeParams 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 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:
-                                                       ^(MTRRVCRunModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
+                                                       ^(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
                                                            NSLog(@"Values: %@", values);
                                                            if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RvcRunMode::Commands::ChangeToModeResponse::Id;
+                                                               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::RvcRunMode::Commands::ChangeToModeResponse::Id;
+                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::Id;
                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
                                                            }
                                                            if (responsesNeeded == 0) {
@@ -54499,7 +54871,7 @@ class RvcRunModeChangeToMode : public ClusterCommand {
     }
 
 private:
-    chip::app::Clusters::RvcRunMode::Commands::ChangeToMode::Type mRequest;
+    chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Type mRequest;
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
@@ -54509,32 +54881,32 @@ class RvcRunModeChangeToMode : public ClusterCommand {
 /*
  * Attribute SupportedModes
  */
-class ReadRvcRunModeSupportedModes : public ReadAttribute {
+class ReadRefrigeratorAndTemperatureControlledCabinetModeSupportedModes : public ReadAttribute {
 public:
-    ReadRvcRunModeSupportedModes()
+    ReadRefrigeratorAndTemperatureControlledCabinetModeSupportedModes()
         : ReadAttribute("supported-modes")
     {
     }
 
-    ~ReadRvcRunModeSupportedModes()
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeSupportedModes()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCRunMode.SupportedModes response %@", [value description]);
+            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.SupportedModes response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCRunMode SupportedModes read Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode SupportedModes read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54543,25 +54915,25 @@ class ReadRvcRunModeSupportedModes : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcRunModeSupportedModes : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSupportedModes : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcRunModeSupportedModes()
+    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSupportedModes()
         : SubscribeAttribute("supported-modes")
     {
     }
 
-    ~SubscribeAttributeRvcRunModeSupportedModes()
+    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSupportedModes()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCRunMode 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();
@@ -54575,7 +54947,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(@"RefrigeratorAndTemperatureControlledCabinetMode.SupportedModes response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54594,32 +54966,32 @@ class SubscribeAttributeRvcRunModeSupportedModes : public SubscribeAttribute {
 /*
  * Attribute CurrentMode
  */
-class ReadRvcRunModeCurrentMode : public ReadAttribute {
+class ReadRefrigeratorAndTemperatureControlledCabinetModeCurrentMode : public ReadAttribute {
 public:
-    ReadRvcRunModeCurrentMode()
+    ReadRefrigeratorAndTemperatureControlledCabinetModeCurrentMode()
         : ReadAttribute("current-mode")
     {
     }
 
-    ~ReadRvcRunModeCurrentMode()
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeCurrentMode()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCRunMode.CurrentMode response %@", [value description]);
+            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.CurrentMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCRunMode CurrentMode read Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode CurrentMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54628,25 +55000,25 @@ class ReadRvcRunModeCurrentMode : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcRunModeCurrentMode : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeCurrentMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcRunModeCurrentMode()
+    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeCurrentMode()
         : SubscribeAttribute("current-mode")
     {
     }
 
-    ~SubscribeAttributeRvcRunModeCurrentMode()
+    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeCurrentMode()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCRunMode 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();
@@ -54660,7 +55032,136 @@ class SubscribeAttributeRvcRunModeCurrentMode : public SubscribeAttribute {
         [cluster subscribeAttributeCurrentModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCRunMode.CurrentMode response %@", [value description]);
+                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.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 ReadRefrigeratorAndTemperatureControlledCabinetModeStartUpMode : public ReadAttribute {
+public:
+    ReadRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
+        : ReadAttribute("start-up-mode")
+    {
+    }
+
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
+    {
+    }
+
+    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 ") ReadAttribute (0x%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];
+        [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("RefrigeratorAndTemperatureControlledCabinetMode StartUpMode read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class WriteRefrigeratorAndTemperatureControlledCabinetModeStartUpMode : public WriteAttribute {
+public:
+    WriteRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
+        : WriteAttribute("start-up-mode")
+    {
+        AddArgument("attr-name", "start-up-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteRefrigeratorAndTemperatureControlledCabinetModeStartUpMode()
+    {
+    }
+
+    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::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 = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode 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(@"RefrigeratorAndTemperatureControlledCabinetMode.StartUpMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54679,32 +55180,32 @@ class SubscribeAttributeRvcRunModeCurrentMode : public SubscribeAttribute {
 /*
  * Attribute OnMode
  */
-class ReadRvcRunModeOnMode : public ReadAttribute {
+class ReadRefrigeratorAndTemperatureControlledCabinetModeOnMode : public ReadAttribute {
 public:
-    ReadRvcRunModeOnMode()
+    ReadRefrigeratorAndTemperatureControlledCabinetModeOnMode()
         : ReadAttribute("on-mode")
     {
     }
 
-    ~ReadRvcRunModeOnMode()
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeOnMode()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCRunMode.OnMode response %@", [value description]);
+            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.OnMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCRunMode OnMode read Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode OnMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54713,9 +55214,9 @@ class ReadRvcRunModeOnMode : public ReadAttribute {
     }
 };
 
-class WriteRvcRunModeOnMode : public WriteAttribute {
+class WriteRefrigeratorAndTemperatureControlledCabinetModeOnMode : public WriteAttribute {
 public:
-    WriteRvcRunModeOnMode()
+    WriteRefrigeratorAndTemperatureControlledCabinetModeOnMode()
         : WriteAttribute("on-mode")
     {
         AddArgument("attr-name", "on-mode");
@@ -54723,18 +55224,18 @@ class WriteRvcRunModeOnMode : public WriteAttribute {
         WriteAttribute::AddArguments();
     }
 
-    ~WriteRvcRunModeOnMode()
+    ~WriteRefrigeratorAndTemperatureControlledCabinetModeOnMode()
     {
     }
 
     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::RefrigeratorAndTemperatureControlledCabinetMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::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 = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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;
@@ -54745,7 +55246,7 @@ class WriteRvcRunModeOnMode : public WriteAttribute {
 
         [cluster writeAttributeOnModeWithValue:value params:params completion:^(NSError * _Nullable error) {
             if (error != nil) {
-                LogNSError("RVCRunMode OnMode write Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode OnMode write Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54757,25 +55258,25 @@ class WriteRvcRunModeOnMode : public WriteAttribute {
     chip::app::DataModel::Nullable<uint8_t> mValue;
 };
 
-class SubscribeAttributeRvcRunModeOnMode : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeOnMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcRunModeOnMode()
+    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeOnMode()
         : SubscribeAttribute("on-mode")
     {
     }
 
-    ~SubscribeAttributeRvcRunModeOnMode()
+    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeOnMode()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCRunMode 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();
@@ -54789,7 +55290,7 @@ class SubscribeAttributeRvcRunModeOnMode : public SubscribeAttribute {
         [cluster subscribeAttributeOnModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCRunMode.OnMode response %@", [value description]);
+                NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.OnMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54808,32 +55309,32 @@ class SubscribeAttributeRvcRunModeOnMode : public SubscribeAttribute {
 /*
  * Attribute GeneratedCommandList
  */
-class ReadRvcRunModeGeneratedCommandList : public ReadAttribute {
+class ReadRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList : public ReadAttribute {
 public:
-    ReadRvcRunModeGeneratedCommandList()
+    ReadRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadRvcRunModeGeneratedCommandList()
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCRunMode.GeneratedCommandList response %@", [value description]);
+            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCRunMode GeneratedCommandList read Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54842,25 +55343,25 @@ class ReadRvcRunModeGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcRunModeGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcRunModeGeneratedCommandList()
+    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeRvcRunModeGeneratedCommandList()
+    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCRunMode 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();
@@ -54874,7 +55375,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(@"RefrigeratorAndTemperatureControlledCabinetMode.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54893,32 +55394,32 @@ class SubscribeAttributeRvcRunModeGeneratedCommandList : public SubscribeAttribu
 /*
  * Attribute AcceptedCommandList
  */
-class ReadRvcRunModeAcceptedCommandList : public ReadAttribute {
+class ReadRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList : public ReadAttribute {
 public:
-    ReadRvcRunModeAcceptedCommandList()
+    ReadRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadRvcRunModeAcceptedCommandList()
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCRunMode.AcceptedCommandList response %@", [value description]);
+            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCRunMode AcceptedCommandList read Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -54927,25 +55428,25 @@ class ReadRvcRunModeAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcRunModeAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcRunModeAcceptedCommandList()
+    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeRvcRunModeAcceptedCommandList()
+    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCRunMode 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();
@@ -54959,7 +55460,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(@"RefrigeratorAndTemperatureControlledCabinetMode.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -54978,32 +55479,32 @@ class SubscribeAttributeRvcRunModeAcceptedCommandList : public SubscribeAttribut
 /*
  * Attribute EventList
  */
-class ReadRvcRunModeEventList : public ReadAttribute {
+class ReadRefrigeratorAndTemperatureControlledCabinetModeEventList : public ReadAttribute {
 public:
-    ReadRvcRunModeEventList()
+    ReadRefrigeratorAndTemperatureControlledCabinetModeEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadRvcRunModeEventList()
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCRunMode.EventList response %@", [value description]);
+            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCRunMode EventList read Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55012,25 +55513,25 @@ class ReadRvcRunModeEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcRunModeEventList : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcRunModeEventList()
+    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeRvcRunModeEventList()
+    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCRunMode 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();
@@ -55044,7 +55545,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(@"RefrigeratorAndTemperatureControlledCabinetMode.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55063,32 +55564,32 @@ class SubscribeAttributeRvcRunModeEventList : public SubscribeAttribute {
 /*
  * Attribute AttributeList
  */
-class ReadRvcRunModeAttributeList : public ReadAttribute {
+class ReadRefrigeratorAndTemperatureControlledCabinetModeAttributeList : public ReadAttribute {
 public:
-    ReadRvcRunModeAttributeList()
+    ReadRefrigeratorAndTemperatureControlledCabinetModeAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadRvcRunModeAttributeList()
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCRunMode.AttributeList response %@", [value description]);
+            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCRunMode AttributeList read Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55097,25 +55598,25 @@ class ReadRvcRunModeAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcRunModeAttributeList : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcRunModeAttributeList()
+    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeRvcRunModeAttributeList()
+    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCRunMode 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();
@@ -55129,7 +55630,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(@"RefrigeratorAndTemperatureControlledCabinetMode.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55148,32 +55649,32 @@ class SubscribeAttributeRvcRunModeAttributeList : public SubscribeAttribute {
 /*
  * Attribute FeatureMap
  */
-class ReadRvcRunModeFeatureMap : public ReadAttribute {
+class ReadRefrigeratorAndTemperatureControlledCabinetModeFeatureMap : public ReadAttribute {
 public:
-    ReadRvcRunModeFeatureMap()
+    ReadRefrigeratorAndTemperatureControlledCabinetModeFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadRvcRunModeFeatureMap()
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCRunMode.FeatureMap response %@", [value description]);
+            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCRunMode FeatureMap read Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55182,25 +55683,25 @@ class ReadRvcRunModeFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcRunModeFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcRunModeFeatureMap()
+    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeRvcRunModeFeatureMap()
+    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCRunMode 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();
@@ -55214,7 +55715,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(@"RefrigeratorAndTemperatureControlledCabinetMode.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55233,32 +55734,32 @@ class SubscribeAttributeRvcRunModeFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadRvcRunModeClusterRevision : public ReadAttribute {
+class ReadRefrigeratorAndTemperatureControlledCabinetModeClusterRevision : public ReadAttribute {
 public:
-    ReadRvcRunModeClusterRevision()
+    ReadRefrigeratorAndTemperatureControlledCabinetModeClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadRvcRunModeClusterRevision()
+    ~ReadRefrigeratorAndTemperatureControlledCabinetModeClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCRunMode.ClusterRevision response %@", [value description]);
+            NSLog(@"RefrigeratorAndTemperatureControlledCabinetMode.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCRunMode ClusterRevision read Error", error);
+                LogNSError("RefrigeratorAndTemperatureControlledCabinetMode ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55267,25 +55768,25 @@ class ReadRvcRunModeClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcRunModeClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcRunModeClusterRevision()
+    SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeRvcRunModeClusterRevision()
+    ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCRunMode 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();
@@ -55299,7 +55800,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(@"RefrigeratorAndTemperatureControlledCabinetMode.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55316,15 +55817,15 @@ class SubscribeAttributeRvcRunModeClusterRevision : public SubscribeAttribute {
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster RvcCleanMode                                                | 0x0055 |
+| Cluster LaundryWasherControls                                       | 0x0053 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * ChangeToMode                                                      |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * SupportedModes                                                    | 0x0000 |
-| * CurrentMode                                                       | 0x0001 |
-| * OnMode                                                            | 0x0003 |
+| * SpinSpeeds                                                        | 0x0000 |
+| * SpinSpeedCurrent                                                  | 0x0001 |
+| * NumberOfRinses                                                    | 0x0002 |
+| * SupportedRinses                                                   | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -55335,93 +55836,37 @@ class SubscribeAttributeRvcRunModeClusterRevision : public SubscribeAttribute {
 | Events:                                                             |        |
 \*----------------------------------------------------------------------------*/
 
-#if MTR_ENABLE_PROVISIONAL
-/*
- * Command ChangeToMode
- */
-class RvcCleanModeChangeToMode : public ClusterCommand {
-public:
-    RvcCleanModeChangeToMode()
-        : 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::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;
-        params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode];
-        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 SupportedModes
+ * Attribute SpinSpeeds
  */
-class ReadRvcCleanModeSupportedModes : public ReadAttribute {
+class ReadLaundryWasherControlsSpinSpeeds : public ReadAttribute {
 public:
-    ReadRvcCleanModeSupportedModes()
-        : ReadAttribute("supported-modes")
+    ReadLaundryWasherControlsSpinSpeeds()
+        : ReadAttribute("spin-speeds")
     {
     }
 
-    ~ReadRvcCleanModeSupportedModes()
+    ~ReadLaundryWasherControlsSpinSpeeds()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCCleanMode.SupportedModes 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("RVCCleanMode SupportedModes read Error", error);
+                LogNSError("LaundryWasherControls SpinSpeeds read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55430,25 +55875,25 @@ class ReadRvcCleanModeSupportedModes : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcCleanModeSupportedModes : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherControlsSpinSpeeds : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcCleanModeSupportedModes()
-        : SubscribeAttribute("supported-modes")
+    SubscribeAttributeLaundryWasherControlsSpinSpeeds()
+        : SubscribeAttribute("spin-speeds")
     {
     }
 
-    ~SubscribeAttributeRvcCleanModeSupportedModes()
+    ~SubscribeAttributeLaundryWasherControlsSpinSpeeds()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCCleanMode 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();
@@ -55459,10 +55904,10 @@ class SubscribeAttributeRvcCleanModeSupportedModes : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSupportedModesWithParams:params
+        [cluster subscribeAttributeSpinSpeedsWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCCleanMode.SupportedModes response %@", [value description]);
+                NSLog(@"LaundryWasherControls.SpinSpeeds response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55479,34 +55924,34 @@ class SubscribeAttributeRvcCleanModeSupportedModes : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute CurrentMode
+ * Attribute SpinSpeedCurrent
  */
-class ReadRvcCleanModeCurrentMode : public ReadAttribute {
+class ReadLaundryWasherControlsSpinSpeedCurrent : public ReadAttribute {
 public:
-    ReadRvcCleanModeCurrentMode()
-        : ReadAttribute("current-mode")
+    ReadLaundryWasherControlsSpinSpeedCurrent()
+        : ReadAttribute("spin-speed-current")
     {
     }
 
-    ~ReadRvcCleanModeCurrentMode()
+    ~ReadLaundryWasherControlsSpinSpeedCurrent()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCCleanMode.CurrentMode 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("RVCCleanMode CurrentMode read Error", error);
+                LogNSError("LaundryWasherControls SpinSpeedCurrent read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55515,25 +55960,69 @@ class ReadRvcCleanModeCurrentMode : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcCleanModeCurrentMode : public SubscribeAttribute {
+class WriteLaundryWasherControlsSpinSpeedCurrent : public WriteAttribute {
 public:
-    SubscribeAttributeRvcCleanModeCurrentMode()
-        : SubscribeAttribute("current-mode")
+    WriteLaundryWasherControlsSpinSpeedCurrent()
+        : WriteAttribute("spin-speed-current")
+    {
+        AddArgument("attr-name", "spin-speed-current");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
+    }
+
+    ~WriteLaundryWasherControlsSpinSpeedCurrent()
     {
     }
 
-    ~SubscribeAttributeRvcCleanModeCurrentMode()
+    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;
+
+        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::RvcCleanMode::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcCleanMode::Attributes::CurrentMode::Id;
+        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 = [[MTRBaseClusterRVCCleanMode 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();
@@ -55544,10 +56033,10 @@ class SubscribeAttributeRvcCleanModeCurrentMode : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeCurrentModeWithParams:params
+        [cluster subscribeAttributeSpinSpeedCurrentWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCCleanMode.CurrentMode response %@", [value description]);
+                NSLog(@"LaundryWasherControls.SpinSpeedCurrent response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55564,34 +56053,34 @@ class SubscribeAttributeRvcCleanModeCurrentMode : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute OnMode
+ * Attribute NumberOfRinses
  */
-class ReadRvcCleanModeOnMode : public ReadAttribute {
+class ReadLaundryWasherControlsNumberOfRinses : public ReadAttribute {
 public:
-    ReadRvcCleanModeOnMode()
-        : ReadAttribute("on-mode")
+    ReadLaundryWasherControlsNumberOfRinses()
+        : ReadAttribute("number-of-rinses")
     {
     }
 
-    ~ReadRvcCleanModeOnMode()
+    ~ReadLaundryWasherControlsNumberOfRinses()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"RVCCleanMode.OnMode 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("RVCCleanMode OnMode read Error", error);
+                LogNSError("LaundryWasherControls NumberOfRinses read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55600,39 +56089,36 @@ class ReadRvcCleanModeOnMode : public ReadAttribute {
     }
 };
 
-class WriteRvcCleanModeOnMode : public WriteAttribute {
+class WriteLaundryWasherControlsNumberOfRinses : public WriteAttribute {
 public:
-    WriteRvcCleanModeOnMode()
-        : WriteAttribute("on-mode")
+    WriteLaundryWasherControlsNumberOfRinses()
+        : WriteAttribute("number-of-rinses")
     {
-        AddArgument("attr-name", "on-mode");
+        AddArgument("attr-name", "number-of-rinses");
         AddArgument("attr-value", 0, UINT8_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteRvcCleanModeOnMode()
+    ~WriteLaundryWasherControlsNumberOfRinses()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCCleanMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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()];
-        }
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
 
-        [cluster writeAttributeOnModeWithValue:value params:params completion:^(NSError * _Nullable error) {
+        [cluster writeAttributeNumberOfRinsesWithValue:value params:params completion:^(NSError * _Nullable error) {
             if (error != nil) {
-                LogNSError("RVCCleanMode OnMode write Error", error);
+                LogNSError("LaundryWasherControls NumberOfRinses write Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55641,28 +56127,28 @@ class WriteRvcCleanModeOnMode : public WriteAttribute {
     }
 
 private:
-    chip::app::DataModel::Nullable<uint8_t> mValue;
+    uint8_t mValue;
 };
 
-class SubscribeAttributeRvcCleanModeOnMode : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherControlsNumberOfRinses : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcCleanModeOnMode()
-        : SubscribeAttribute("on-mode")
+    SubscribeAttributeLaundryWasherControlsNumberOfRinses()
+        : SubscribeAttribute("number-of-rinses")
     {
     }
 
-    ~SubscribeAttributeRvcCleanModeOnMode()
+    ~SubscribeAttributeLaundryWasherControlsNumberOfRinses()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCCleanMode 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();
@@ -55673,10 +56159,95 @@ class SubscribeAttributeRvcCleanModeOnMode : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeOnModeWithParams:params
+        [cluster subscribeAttributeNumberOfRinsesWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCCleanMode.OnMode response %@", [value description]);
+                NSLog(@"LaundryWasherControls.NumberOfRinses 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 SupportedRinses
+ */
+class ReadLaundryWasherControlsSupportedRinses : public ReadAttribute {
+public:
+    ReadLaundryWasherControlsSupportedRinses()
+        : ReadAttribute("supported-rinses")
+    {
+    }
+
+    ~ReadLaundryWasherControlsSupportedRinses()
+    {
+    }
+
+    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;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%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]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("LaundryWasherControls SupportedRinses read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeLaundryWasherControlsSupportedRinses : public SubscribeAttribute {
+public:
+    SubscribeAttributeLaundryWasherControlsSupportedRinses()
+        : SubscribeAttribute("supported-rinses")
+    {
+    }
+
+    ~SubscribeAttributeLaundryWasherControlsSupportedRinses()
+    {
+    }
+
+    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;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%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 = [[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 subscribeAttributeSupportedRinsesWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"LaundryWasherControls.SupportedRinses response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55695,32 +56266,32 @@ class SubscribeAttributeRvcCleanModeOnMode : public SubscribeAttribute {
 /*
  * Attribute GeneratedCommandList
  */
-class ReadRvcCleanModeGeneratedCommandList : public ReadAttribute {
+class ReadLaundryWasherControlsGeneratedCommandList : public ReadAttribute {
 public:
-    ReadRvcCleanModeGeneratedCommandList()
+    ReadLaundryWasherControlsGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadRvcCleanModeGeneratedCommandList()
+    ~ReadLaundryWasherControlsGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCCleanMode 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(@"RVCCleanMode.GeneratedCommandList response %@", [value description]);
+            NSLog(@"LaundryWasherControls.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCCleanMode GeneratedCommandList read Error", error);
+                LogNSError("LaundryWasherControls GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55729,25 +56300,25 @@ class ReadRvcCleanModeGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcCleanModeGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherControlsGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcCleanModeGeneratedCommandList()
+    SubscribeAttributeLaundryWasherControlsGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeRvcCleanModeGeneratedCommandList()
+    ~SubscribeAttributeLaundryWasherControlsGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCCleanMode 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();
@@ -55761,7 +56332,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(@"LaundryWasherControls.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55780,32 +56351,32 @@ class SubscribeAttributeRvcCleanModeGeneratedCommandList : public SubscribeAttri
 /*
  * Attribute AcceptedCommandList
  */
-class ReadRvcCleanModeAcceptedCommandList : public ReadAttribute {
+class ReadLaundryWasherControlsAcceptedCommandList : public ReadAttribute {
 public:
-    ReadRvcCleanModeAcceptedCommandList()
+    ReadLaundryWasherControlsAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadRvcCleanModeAcceptedCommandList()
+    ~ReadLaundryWasherControlsAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCCleanMode 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(@"RVCCleanMode.AcceptedCommandList response %@", [value description]);
+            NSLog(@"LaundryWasherControls.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCCleanMode AcceptedCommandList read Error", error);
+                LogNSError("LaundryWasherControls AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55814,25 +56385,25 @@ class ReadRvcCleanModeAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcCleanModeAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherControlsAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcCleanModeAcceptedCommandList()
+    SubscribeAttributeLaundryWasherControlsAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeRvcCleanModeAcceptedCommandList()
+    ~SubscribeAttributeLaundryWasherControlsAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCCleanMode 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();
@@ -55846,7 +56417,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(@"LaundryWasherControls.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55865,32 +56436,32 @@ class SubscribeAttributeRvcCleanModeAcceptedCommandList : public SubscribeAttrib
 /*
  * Attribute EventList
  */
-class ReadRvcCleanModeEventList : public ReadAttribute {
+class ReadLaundryWasherControlsEventList : public ReadAttribute {
 public:
-    ReadRvcCleanModeEventList()
+    ReadLaundryWasherControlsEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadRvcCleanModeEventList()
+    ~ReadLaundryWasherControlsEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCCleanMode 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(@"RVCCleanMode.EventList response %@", [value description]);
+            NSLog(@"LaundryWasherControls.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCCleanMode EventList read Error", error);
+                LogNSError("LaundryWasherControls EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55899,25 +56470,25 @@ class ReadRvcCleanModeEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcCleanModeEventList : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherControlsEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcCleanModeEventList()
+    SubscribeAttributeLaundryWasherControlsEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeRvcCleanModeEventList()
+    ~SubscribeAttributeLaundryWasherControlsEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCCleanMode 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();
@@ -55931,7 +56502,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(@"LaundryWasherControls.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -55950,32 +56521,32 @@ class SubscribeAttributeRvcCleanModeEventList : public SubscribeAttribute {
 /*
  * Attribute AttributeList
  */
-class ReadRvcCleanModeAttributeList : public ReadAttribute {
+class ReadLaundryWasherControlsAttributeList : public ReadAttribute {
 public:
-    ReadRvcCleanModeAttributeList()
+    ReadLaundryWasherControlsAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadRvcCleanModeAttributeList()
+    ~ReadLaundryWasherControlsAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCCleanMode 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(@"RVCCleanMode.AttributeList response %@", [value description]);
+            NSLog(@"LaundryWasherControls.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCCleanMode AttributeList read Error", error);
+                LogNSError("LaundryWasherControls AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -55984,25 +56555,25 @@ class ReadRvcCleanModeAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcCleanModeAttributeList : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherControlsAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcCleanModeAttributeList()
+    SubscribeAttributeLaundryWasherControlsAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeRvcCleanModeAttributeList()
+    ~SubscribeAttributeLaundryWasherControlsAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCCleanMode 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();
@@ -56016,7 +56587,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(@"LaundryWasherControls.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -56035,32 +56606,32 @@ class SubscribeAttributeRvcCleanModeAttributeList : public SubscribeAttribute {
 /*
  * Attribute FeatureMap
  */
-class ReadRvcCleanModeFeatureMap : public ReadAttribute {
+class ReadLaundryWasherControlsFeatureMap : public ReadAttribute {
 public:
-    ReadRvcCleanModeFeatureMap()
+    ReadLaundryWasherControlsFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadRvcCleanModeFeatureMap()
+    ~ReadLaundryWasherControlsFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCCleanMode 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(@"RVCCleanMode.FeatureMap response %@", [value description]);
+            NSLog(@"LaundryWasherControls.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCCleanMode FeatureMap read Error", error);
+                LogNSError("LaundryWasherControls FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -56069,25 +56640,25 @@ class ReadRvcCleanModeFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcCleanModeFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherControlsFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcCleanModeFeatureMap()
+    SubscribeAttributeLaundryWasherControlsFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeRvcCleanModeFeatureMap()
+    ~SubscribeAttributeLaundryWasherControlsFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCCleanMode 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();
@@ -56101,7 +56672,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(@"LaundryWasherControls.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -56120,32 +56691,32 @@ class SubscribeAttributeRvcCleanModeFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadRvcCleanModeClusterRevision : public ReadAttribute {
+class ReadLaundryWasherControlsClusterRevision : public ReadAttribute {
 public:
-    ReadRvcCleanModeClusterRevision()
+    ReadLaundryWasherControlsClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadRvcCleanModeClusterRevision()
+    ~ReadLaundryWasherControlsClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCCleanMode 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(@"RVCCleanMode.ClusterRevision response %@", [value description]);
+            NSLog(@"LaundryWasherControls.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RVCCleanMode ClusterRevision read Error", error);
+                LogNSError("LaundryWasherControls ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -56154,25 +56725,25 @@ class ReadRvcCleanModeClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcCleanModeClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeLaundryWasherControlsClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcCleanModeClusterRevision()
+    SubscribeAttributeLaundryWasherControlsClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeRvcCleanModeClusterRevision()
+    ~SubscribeAttributeLaundryWasherControlsClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCCleanMode 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();
@@ -56186,7 +56757,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(@"LaundryWasherControls.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -56203,18 +56774,15 @@ class SubscribeAttributeRvcCleanModeClusterRevision : public SubscribeAttribute
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster TemperatureControl                                          | 0x0056 |
+| Cluster RvcRunMode                                                  | 0x0054 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * SetTemperature                                                    |   0x00 |
+| * ChangeToMode                                                      |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * TemperatureSetpoint                                               | 0x0000 |
-| * MinTemperature                                                    | 0x0001 |
-| * MaxTemperature                                                    | 0x0002 |
-| * Step                                                              | 0x0003 |
-| * SelectedTemperatureLevel                                          | 0x0004 |
-| * SupportedTemperatureLevels                                        | 0x0005 |
+| * SupportedModes                                                    | 0x0000 |
+| * CurrentMode                                                       | 0x0001 |
+| * OnMode                                                            | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -56227,60 +56795,60 @@ class SubscribeAttributeRvcCleanModeClusterRevision : public SubscribeAttribute
 
 #if MTR_ENABLE_PROVISIONAL
 /*
- * Command SetTemperature
+ * Command ChangeToMode
  */
-class TemperatureControlSetTemperature : public ClusterCommand {
+class RvcRunModeChangeToMode : public ClusterCommand {
 public:
-    TemperatureControlSetTemperature()
-        : ClusterCommand("set-temperature")
+    RvcRunModeChangeToMode()
+        : 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::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 = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRTemperatureControlClusterSetTemperatureParams 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 (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:
+                                                       ^(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::TemperatureControl::Commands::SetTemperature::Type mRequest;
+    chip::app::Clusters::RvcRunMode::Commands::ChangeToMode::Type mRequest;
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
@@ -56288,34 +56856,34 @@ class TemperatureControlSetTemperature : public ClusterCommand {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute TemperatureSetpoint
+ * Attribute SupportedModes
  */
-class ReadTemperatureControlTemperatureSetpoint : public ReadAttribute {
+class ReadRvcRunModeSupportedModes : public ReadAttribute {
 public:
-    ReadTemperatureControlTemperatureSetpoint()
-        : ReadAttribute("temperature-setpoint")
+    ReadRvcRunModeSupportedModes()
+        : ReadAttribute("supported-modes")
     {
     }
 
-    ~ReadTemperatureControlTemperatureSetpoint()
+    ~ReadRvcRunModeSupportedModes()
     {
     }
 
     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::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 = [[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 = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCRunMode.SupportedModes response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("TemperatureControl TemperatureSetpoint read Error", error);
+                LogNSError("RVCRunMode SupportedModes read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -56324,25 +56892,25 @@ class ReadTemperatureControlTemperatureSetpoint : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlTemperatureSetpoint : public SubscribeAttribute {
+class SubscribeAttributeRvcRunModeSupportedModes : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureControlTemperatureSetpoint()
-        : SubscribeAttribute("temperature-setpoint")
+    SubscribeAttributeRvcRunModeSupportedModes()
+        : SubscribeAttribute("supported-modes")
     {
     }
 
-    ~SubscribeAttributeTemperatureControlTemperatureSetpoint()
+    ~SubscribeAttributeRvcRunModeSupportedModes()
     {
     }
 
     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::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 = [[MTRBaseClusterTemperatureControl 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();
@@ -56353,10 +56921,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(@"RVCRunMode.SupportedModes response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -56373,34 +56941,34 @@ class SubscribeAttributeTemperatureControlTemperatureSetpoint : public Subscribe
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute MinTemperature
+ * Attribute CurrentMode
  */
-class ReadTemperatureControlMinTemperature : public ReadAttribute {
+class ReadRvcRunModeCurrentMode : public ReadAttribute {
 public:
-    ReadTemperatureControlMinTemperature()
-        : ReadAttribute("min-temperature")
+    ReadRvcRunModeCurrentMode()
+        : ReadAttribute("current-mode")
     {
     }
 
-    ~ReadTemperatureControlMinTemperature()
+    ~ReadRvcRunModeCurrentMode()
     {
     }
 
     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::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 = [[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 = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RVCRunMode.CurrentMode response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("TemperatureControl MinTemperature read Error", error);
+                LogNSError("RVCRunMode CurrentMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -56409,25 +56977,25 @@ class ReadTemperatureControlMinTemperature : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlMinTemperature : public SubscribeAttribute {
+class SubscribeAttributeRvcRunModeCurrentMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureControlMinTemperature()
-        : SubscribeAttribute("min-temperature")
+    SubscribeAttributeRvcRunModeCurrentMode()
+        : SubscribeAttribute("current-mode")
     {
     }
 
-    ~SubscribeAttributeTemperatureControlMinTemperature()
+    ~SubscribeAttributeRvcRunModeCurrentMode()
     {
     }
 
     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::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 = [[MTRBaseClusterTemperatureControl 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();
@@ -56438,10 +57006,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(@"RVCRunMode.CurrentMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -56458,34 +57026,34 @@ class SubscribeAttributeTemperatureControlMinTemperature : public SubscribeAttri
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute MaxTemperature
+ * Attribute OnMode
  */
-class ReadTemperatureControlMaxTemperature : public ReadAttribute {
+class ReadRvcRunModeOnMode : public ReadAttribute {
 public:
-    ReadTemperatureControlMaxTemperature()
-        : ReadAttribute("max-temperature")
+    ReadRvcRunModeOnMode()
+        : ReadAttribute("on-mode")
     {
     }
 
-    ~ReadTemperatureControlMaxTemperature()
+    ~ReadRvcRunModeOnMode()
     {
     }
 
     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::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 = [[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 = [[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("TemperatureControl MaxTemperature read Error", error);
+                LogNSError("RVCRunMode OnMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -56494,195 +57062,69 @@ class ReadTemperatureControlMaxTemperature : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlMaxTemperature : public SubscribeAttribute {
+class WriteRvcRunModeOnMode : public WriteAttribute {
 public:
-    SubscribeAttributeTemperatureControlMaxTemperature()
-        : SubscribeAttribute("max-temperature")
+    WriteRvcRunModeOnMode()
+        : WriteAttribute("on-mode")
     {
+        AddArgument("attr-name", "on-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeTemperatureControlMaxTemperature()
+    ~WriteRvcRunModeOnMode()
     {
     }
 
     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::RvcRunMode::Id;
+        constexpr chip::AttributeId 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);
+        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 = [[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;
+        NSNumber * _Nullable value = nil;
+        if (!mValue.IsNull()) {
+            value = [NSNumber numberWithUnsignedChar:mValue.Value()];
         }
-        [cluster subscribeAttributeMaxTemperatureWithParams:params
-            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.MaxTemperature 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 Step
- */
-class ReadTemperatureControlStep : public ReadAttribute {
-public:
-    ReadTemperatureControlStep()
-        : ReadAttribute("step")
-    {
-    }
-
-    ~ReadTemperatureControlStep()
-    {
-    }
-
-    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;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%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]);
-            if (error == nil) {
-                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
-            } else {
-                LogNSError("TemperatureControl Step read Error", error);
+        [cluster writeAttributeOnModeWithValue:value params:params completion:^(NSError * _Nullable error) {
+            if (error != nil) {
+                LogNSError("RVCRunMode OnMode write Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
         }];
         return CHIP_NO_ERROR;
     }
-};
-
-class SubscribeAttributeTemperatureControlStep : public SubscribeAttribute {
-public:
-    SubscribeAttributeTemperatureControlStep()
-        : SubscribeAttribute("step")
-    {
-    }
-
-    ~SubscribeAttributeTemperatureControlStep()
-    {
-    }
-
-    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;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%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();
-        }
-        [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);
-                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 SubscribeAttributeRvcRunModeOnMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureControlSelectedTemperatureLevel()
-        : SubscribeAttribute("selected-temperature-level")
+    SubscribeAttributeRvcRunModeOnMode()
+        : SubscribeAttribute("on-mode")
     {
     }
 
-    ~SubscribeAttributeTemperatureControlSelectedTemperatureLevel()
+    ~SubscribeAttributeRvcRunModeOnMode()
     {
     }
 
     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::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 = [[MTRBaseClusterTemperatureControl 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();
@@ -56693,95 +57135,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]);
-                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 SupportedTemperatureLevels
- */
-class ReadTemperatureControlSupportedTemperatureLevels : public ReadAttribute {
-public:
-    ReadTemperatureControlSupportedTemperatureLevels()
-        : ReadAttribute("supported-temperature-levels")
-    {
-    }
-
-    ~ReadTemperatureControlSupportedTemperatureLevels()
-    {
-    }
-
-    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;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%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]);
-            if (error == nil) {
-                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
-            } else {
-                LogNSError("TemperatureControl SupportedTemperatureLevels read Error", error);
-                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
-    }
-};
-
-class SubscribeAttributeTemperatureControlSupportedTemperatureLevels : public SubscribeAttribute {
-public:
-    SubscribeAttributeTemperatureControlSupportedTemperatureLevels()
-        : SubscribeAttribute("supported-temperature-levels")
-    {
-    }
-
-    ~SubscribeAttributeTemperatureControlSupportedTemperatureLevels()
-    {
-    }
-
-    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;
-
-        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%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();
-        }
-        [cluster subscribeAttributeSupportedTemperatureLevelsWithParams:params
-            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.SupportedTemperatureLevels response %@", [value description]);
+                NSLog(@"RVCRunMode.OnMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -56800,32 +57157,32 @@ class SubscribeAttributeTemperatureControlSupportedTemperatureLevels : public Su
 /*
  * Attribute GeneratedCommandList
  */
-class ReadTemperatureControlGeneratedCommandList : public ReadAttribute {
+class ReadRvcRunModeGeneratedCommandList : public ReadAttribute {
 public:
-    ReadTemperatureControlGeneratedCommandList()
+    ReadRvcRunModeGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadTemperatureControlGeneratedCommandList()
+    ~ReadRvcRunModeGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureControl.GeneratedCommandList response %@", [value description]);
+            NSLog(@"RVCRunMode.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("TemperatureControl GeneratedCommandList read Error", error);
+                LogNSError("RVCRunMode GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -56834,25 +57191,25 @@ class ReadTemperatureControlGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeRvcRunModeGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureControlGeneratedCommandList()
+    SubscribeAttributeRvcRunModeGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeTemperatureControlGeneratedCommandList()
+    ~SubscribeAttributeRvcRunModeGeneratedCommandList()
     {
     }
 
     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::RvcRunMode::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::RvcRunMode::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 = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -56866,7 +57223,7 @@ class SubscribeAttributeTemperatureControlGeneratedCommandList : public Subscrib
         [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.GeneratedCommandList response %@", [value description]);
+                NSLog(@"RVCRunMode.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -56885,32 +57242,32 @@ class SubscribeAttributeTemperatureControlGeneratedCommandList : public Subscrib
 /*
  * Attribute AcceptedCommandList
  */
-class ReadTemperatureControlAcceptedCommandList : public ReadAttribute {
+class ReadRvcRunModeAcceptedCommandList : public ReadAttribute {
 public:
-    ReadTemperatureControlAcceptedCommandList()
+    ReadRvcRunModeAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadTemperatureControlAcceptedCommandList()
+    ~ReadRvcRunModeAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureControl.AcceptedCommandList response %@", [value description]);
+            NSLog(@"RVCRunMode.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("TemperatureControl AcceptedCommandList read Error", error);
+                LogNSError("RVCRunMode AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -56919,25 +57276,25 @@ class ReadTemperatureControlAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeRvcRunModeAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureControlAcceptedCommandList()
+    SubscribeAttributeRvcRunModeAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeTemperatureControlAcceptedCommandList()
+    ~SubscribeAttributeRvcRunModeAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterTemperatureControl 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();
@@ -56951,7 +57308,7 @@ class SubscribeAttributeTemperatureControlAcceptedCommandList : public Subscribe
         [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.AcceptedCommandList response %@", [value description]);
+                NSLog(@"RVCRunMode.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -56970,32 +57327,32 @@ class SubscribeAttributeTemperatureControlAcceptedCommandList : public Subscribe
 /*
  * Attribute EventList
  */
-class ReadTemperatureControlEventList : public ReadAttribute {
+class ReadRvcRunModeEventList : public ReadAttribute {
 public:
-    ReadTemperatureControlEventList()
+    ReadRvcRunModeEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadTemperatureControlEventList()
+    ~ReadRvcRunModeEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureControl.EventList response %@", [value description]);
+            NSLog(@"RVCRunMode.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("TemperatureControl EventList read Error", error);
+                LogNSError("RVCRunMode EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57004,25 +57361,25 @@ class ReadTemperatureControlEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlEventList : public SubscribeAttribute {
+class SubscribeAttributeRvcRunModeEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureControlEventList()
+    SubscribeAttributeRvcRunModeEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeTemperatureControlEventList()
+    ~SubscribeAttributeRvcRunModeEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterTemperatureControl 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();
@@ -57036,7 +57393,7 @@ class SubscribeAttributeTemperatureControlEventList : public SubscribeAttribute
         [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.EventList response %@", [value description]);
+                NSLog(@"RVCRunMode.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57055,32 +57412,32 @@ class SubscribeAttributeTemperatureControlEventList : public SubscribeAttribute
 /*
  * Attribute AttributeList
  */
-class ReadTemperatureControlAttributeList : public ReadAttribute {
+class ReadRvcRunModeAttributeList : public ReadAttribute {
 public:
-    ReadTemperatureControlAttributeList()
+    ReadRvcRunModeAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadTemperatureControlAttributeList()
+    ~ReadRvcRunModeAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureControl.AttributeList response %@", [value description]);
+            NSLog(@"RVCRunMode.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("TemperatureControl AttributeList read Error", error);
+                LogNSError("RVCRunMode AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57089,25 +57446,25 @@ class ReadTemperatureControlAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlAttributeList : public SubscribeAttribute {
+class SubscribeAttributeRvcRunModeAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureControlAttributeList()
+    SubscribeAttributeRvcRunModeAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeTemperatureControlAttributeList()
+    ~SubscribeAttributeRvcRunModeAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterTemperatureControl 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();
@@ -57121,7 +57478,7 @@ class SubscribeAttributeTemperatureControlAttributeList : public SubscribeAttrib
         [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.AttributeList response %@", [value description]);
+                NSLog(@"RVCRunMode.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57140,32 +57497,32 @@ class SubscribeAttributeTemperatureControlAttributeList : public SubscribeAttrib
 /*
  * Attribute FeatureMap
  */
-class ReadTemperatureControlFeatureMap : public ReadAttribute {
+class ReadRvcRunModeFeatureMap : public ReadAttribute {
 public:
-    ReadTemperatureControlFeatureMap()
+    ReadRvcRunModeFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadTemperatureControlFeatureMap()
+    ~ReadRvcRunModeFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureControl.FeatureMap response %@", [value description]);
+            NSLog(@"RVCRunMode.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("TemperatureControl FeatureMap read Error", error);
+                LogNSError("RVCRunMode FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57174,25 +57531,25 @@ class ReadTemperatureControlFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeRvcRunModeFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureControlFeatureMap()
+    SubscribeAttributeRvcRunModeFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeTemperatureControlFeatureMap()
+    ~SubscribeAttributeRvcRunModeFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterTemperatureControl 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();
@@ -57206,7 +57563,7 @@ class SubscribeAttributeTemperatureControlFeatureMap : public SubscribeAttribute
         [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.FeatureMap response %@", [value description]);
+                NSLog(@"RVCRunMode.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57225,32 +57582,32 @@ class SubscribeAttributeTemperatureControlFeatureMap : public SubscribeAttribute
 /*
  * Attribute ClusterRevision
  */
-class ReadTemperatureControlClusterRevision : public ReadAttribute {
+class ReadRvcRunModeClusterRevision : public ReadAttribute {
 public:
-    ReadTemperatureControlClusterRevision()
+    ReadRvcRunModeClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadTemperatureControlClusterRevision()
+    ~ReadRvcRunModeClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterRVCRunMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"TemperatureControl.ClusterRevision response %@", [value description]);
+            NSLog(@"RVCRunMode.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("TemperatureControl ClusterRevision read Error", error);
+                LogNSError("RVCRunMode ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57259,25 +57616,25 @@ class ReadTemperatureControlClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeTemperatureControlClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeRvcRunModeClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeTemperatureControlClusterRevision()
+    SubscribeAttributeRvcRunModeClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeTemperatureControlClusterRevision()
+    ~SubscribeAttributeRvcRunModeClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterTemperatureControl 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();
@@ -57291,7 +57648,7 @@ class SubscribeAttributeTemperatureControlClusterRevision : public SubscribeAttr
         [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"TemperatureControl.ClusterRevision response %@", [value description]);
+                NSLog(@"RVCRunMode.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57308,14 +57665,15 @@ class SubscribeAttributeTemperatureControlClusterRevision : public SubscribeAttr
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster RefrigeratorAlarm                                           | 0x0057 |
+| Cluster RvcCleanMode                                                | 0x0055 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
+| * ChangeToMode                                                      |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * Mask                                                              | 0x0000 |
-| * State                                                             | 0x0002 |
-| * Supported                                                         | 0x0003 |
+| * SupportedModes                                                    | 0x0000 |
+| * CurrentMode                                                       | 0x0001 |
+| * OnMode                                                            | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -57324,40 +57682,99 @@ class SubscribeAttributeTemperatureControlClusterRevision : public SubscribeAttr
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
-| * Notify                                                            | 0x0000 |
 \*----------------------------------------------------------------------------*/
 
+#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 Mask
+ * Attribute SupportedModes
  */
-class ReadRefrigeratorAlarmMask : public ReadAttribute {
+class ReadRvcCleanModeSupportedModes : public ReadAttribute {
 public:
-    ReadRefrigeratorAlarmMask()
-        : ReadAttribute("mask")
+    ReadRvcCleanModeSupportedModes()
+        : ReadAttribute("supported-modes")
     {
     }
 
-    ~ReadRefrigeratorAlarmMask()
+    ~ReadRvcCleanModeSupportedModes()
     {
     }
 
     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::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 = [[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 = [[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("RefrigeratorAlarm Mask read Error", error);
+                LogNSError("RVCCleanMode SupportedModes read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57366,25 +57783,25 @@ class ReadRefrigeratorAlarmMask : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRefrigeratorAlarmMask : public SubscribeAttribute {
+class SubscribeAttributeRvcCleanModeSupportedModes : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAlarmMask()
-        : SubscribeAttribute("mask")
+    SubscribeAttributeRvcCleanModeSupportedModes()
+        : SubscribeAttribute("supported-modes")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAlarmMask()
+    ~SubscribeAttributeRvcCleanModeSupportedModes()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAlarm 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();
@@ -57395,10 +57812,10 @@ class SubscribeAttributeRefrigeratorAlarmMask : 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(@"RefrigeratorAlarm.Mask 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 {
@@ -57415,34 +57832,34 @@ class SubscribeAttributeRefrigeratorAlarmMask : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute State
+ * Attribute CurrentMode
  */
-class ReadRefrigeratorAlarmState : public ReadAttribute {
+class ReadRvcCleanModeCurrentMode : public ReadAttribute {
 public:
-    ReadRefrigeratorAlarmState()
-        : ReadAttribute("state")
+    ReadRvcCleanModeCurrentMode()
+        : ReadAttribute("current-mode")
     {
     }
 
-    ~ReadRefrigeratorAlarmState()
+    ~ReadRvcCleanModeCurrentMode()
     {
     }
 
     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::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 = [[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 = [[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("RefrigeratorAlarm State read Error", error);
+                LogNSError("RVCCleanMode CurrentMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57451,25 +57868,25 @@ class ReadRefrigeratorAlarmState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRefrigeratorAlarmState : public SubscribeAttribute {
+class SubscribeAttributeRvcCleanModeCurrentMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAlarmState()
-        : SubscribeAttribute("state")
+    SubscribeAttributeRvcCleanModeCurrentMode()
+        : SubscribeAttribute("current-mode")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAlarmState()
+    ~SubscribeAttributeRvcCleanModeCurrentMode()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAlarm 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();
@@ -57480,10 +57897,10 @@ class SubscribeAttributeRefrigeratorAlarmState : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeStateWithParams:params
+        [cluster subscribeAttributeCurrentModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAlarm.State response %@", [value description]);
+                NSLog(@"RVCCleanMode.CurrentMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57500,34 +57917,34 @@ class SubscribeAttributeRefrigeratorAlarmState : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute Supported
+ * Attribute OnMode
  */
-class ReadRefrigeratorAlarmSupported : public ReadAttribute {
+class ReadRvcCleanModeOnMode : public ReadAttribute {
 public:
-    ReadRefrigeratorAlarmSupported()
-        : ReadAttribute("supported")
+    ReadRvcCleanModeOnMode()
+        : ReadAttribute("on-mode")
     {
     }
 
-    ~ReadRefrigeratorAlarmSupported()
+    ~ReadRvcCleanModeOnMode()
     {
     }
 
     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::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 = [[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 = [[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("RefrigeratorAlarm Supported read Error", error);
+                LogNSError("RVCCleanMode OnMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57536,25 +57953,69 @@ class ReadRefrigeratorAlarmSupported : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRefrigeratorAlarmSupported : public SubscribeAttribute {
+class WriteRvcCleanModeOnMode : public WriteAttribute {
 public:
-    SubscribeAttributeRefrigeratorAlarmSupported()
-        : SubscribeAttribute("supported")
+    WriteRvcCleanModeOnMode()
+        : WriteAttribute("on-mode")
     {
+        AddArgument("attr-name", "on-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeRefrigeratorAlarmSupported()
+    ~WriteRvcCleanModeOnMode()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAlarm 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();
@@ -57565,10 +58026,10 @@ class SubscribeAttributeRefrigeratorAlarmSupported : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSupportedWithParams:params
+        [cluster subscribeAttributeOnModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RefrigeratorAlarm.Supported response %@", [value description]);
+                NSLog(@"RVCCleanMode.OnMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57587,32 +58048,32 @@ class SubscribeAttributeRefrigeratorAlarmSupported : public SubscribeAttribute {
 /*
  * Attribute GeneratedCommandList
  */
-class ReadRefrigeratorAlarmGeneratedCommandList : public ReadAttribute {
+class ReadRvcCleanModeGeneratedCommandList : public ReadAttribute {
 public:
-    ReadRefrigeratorAlarmGeneratedCommandList()
+    ReadRvcCleanModeGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadRefrigeratorAlarmGeneratedCommandList()
+    ~ReadRvcCleanModeGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAlarm 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(@"RefrigeratorAlarm.GeneratedCommandList response %@", [value description]);
+            NSLog(@"RVCCleanMode.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAlarm GeneratedCommandList read Error", error);
+                LogNSError("RVCCleanMode GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57621,25 +58082,25 @@ class ReadRefrigeratorAlarmGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRefrigeratorAlarmGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeRvcCleanModeGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAlarmGeneratedCommandList()
+    SubscribeAttributeRvcCleanModeGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAlarmGeneratedCommandList()
+    ~SubscribeAttributeRvcCleanModeGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAlarm 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();
@@ -57653,7 +58114,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(@"RVCCleanMode.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57672,32 +58133,32 @@ class SubscribeAttributeRefrigeratorAlarmGeneratedCommandList : public Subscribe
 /*
  * Attribute AcceptedCommandList
  */
-class ReadRefrigeratorAlarmAcceptedCommandList : public ReadAttribute {
+class ReadRvcCleanModeAcceptedCommandList : public ReadAttribute {
 public:
-    ReadRefrigeratorAlarmAcceptedCommandList()
+    ReadRvcCleanModeAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadRefrigeratorAlarmAcceptedCommandList()
+    ~ReadRvcCleanModeAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAlarm 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(@"RefrigeratorAlarm.AcceptedCommandList response %@", [value description]);
+            NSLog(@"RVCCleanMode.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAlarm AcceptedCommandList read Error", error);
+                LogNSError("RVCCleanMode AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57706,25 +58167,25 @@ class ReadRefrigeratorAlarmAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRefrigeratorAlarmAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeRvcCleanModeAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAlarmAcceptedCommandList()
+    SubscribeAttributeRvcCleanModeAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAlarmAcceptedCommandList()
+    ~SubscribeAttributeRvcCleanModeAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAlarm 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();
@@ -57738,7 +58199,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(@"RVCCleanMode.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57757,32 +58218,32 @@ class SubscribeAttributeRefrigeratorAlarmAcceptedCommandList : public SubscribeA
 /*
  * Attribute EventList
  */
-class ReadRefrigeratorAlarmEventList : public ReadAttribute {
+class ReadRvcCleanModeEventList : public ReadAttribute {
 public:
-    ReadRefrigeratorAlarmEventList()
+    ReadRvcCleanModeEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadRefrigeratorAlarmEventList()
+    ~ReadRvcCleanModeEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAlarm 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(@"RefrigeratorAlarm.EventList response %@", [value description]);
+            NSLog(@"RVCCleanMode.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAlarm EventList read Error", error);
+                LogNSError("RVCCleanMode EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57791,25 +58252,25 @@ class ReadRefrigeratorAlarmEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRefrigeratorAlarmEventList : public SubscribeAttribute {
+class SubscribeAttributeRvcCleanModeEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAlarmEventList()
+    SubscribeAttributeRvcCleanModeEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAlarmEventList()
+    ~SubscribeAttributeRvcCleanModeEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAlarm 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();
@@ -57823,7 +58284,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(@"RVCCleanMode.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57842,32 +58303,32 @@ class SubscribeAttributeRefrigeratorAlarmEventList : public SubscribeAttribute {
 /*
  * Attribute AttributeList
  */
-class ReadRefrigeratorAlarmAttributeList : public ReadAttribute {
+class ReadRvcCleanModeAttributeList : public ReadAttribute {
 public:
-    ReadRefrigeratorAlarmAttributeList()
+    ReadRvcCleanModeAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadRefrigeratorAlarmAttributeList()
+    ~ReadRvcCleanModeAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAlarm 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(@"RefrigeratorAlarm.AttributeList response %@", [value description]);
+            NSLog(@"RVCCleanMode.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAlarm AttributeList read Error", error);
+                LogNSError("RVCCleanMode AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57876,25 +58337,25 @@ class ReadRefrigeratorAlarmAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRefrigeratorAlarmAttributeList : public SubscribeAttribute {
+class SubscribeAttributeRvcCleanModeAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAlarmAttributeList()
+    SubscribeAttributeRvcCleanModeAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAlarmAttributeList()
+    ~SubscribeAttributeRvcCleanModeAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAlarm 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();
@@ -57908,7 +58369,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(@"RVCCleanMode.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -57927,32 +58388,32 @@ class SubscribeAttributeRefrigeratorAlarmAttributeList : public SubscribeAttribu
 /*
  * Attribute FeatureMap
  */
-class ReadRefrigeratorAlarmFeatureMap : public ReadAttribute {
+class ReadRvcCleanModeFeatureMap : public ReadAttribute {
 public:
-    ReadRefrigeratorAlarmFeatureMap()
+    ReadRvcCleanModeFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadRefrigeratorAlarmFeatureMap()
+    ~ReadRvcCleanModeFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAlarm 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(@"RefrigeratorAlarm.FeatureMap response %@", [value description]);
+            NSLog(@"RVCCleanMode.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAlarm FeatureMap read Error", error);
+                LogNSError("RVCCleanMode FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -57961,25 +58422,25 @@ class ReadRefrigeratorAlarmFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRefrigeratorAlarmFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeRvcCleanModeFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAlarmFeatureMap()
+    SubscribeAttributeRvcCleanModeFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAlarmFeatureMap()
+    ~SubscribeAttributeRvcCleanModeFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAlarm 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();
@@ -57993,7 +58454,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(@"RVCCleanMode.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58012,32 +58473,32 @@ class SubscribeAttributeRefrigeratorAlarmFeatureMap : public SubscribeAttribute
 /*
  * Attribute ClusterRevision
  */
-class ReadRefrigeratorAlarmClusterRevision : public ReadAttribute {
+class ReadRvcCleanModeClusterRevision : public ReadAttribute {
 public:
-    ReadRefrigeratorAlarmClusterRevision()
+    ReadRvcCleanModeClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadRefrigeratorAlarmClusterRevision()
+    ~ReadRvcCleanModeClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAlarm 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(@"RefrigeratorAlarm.ClusterRevision response %@", [value description]);
+            NSLog(@"RVCCleanMode.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("RefrigeratorAlarm ClusterRevision read Error", error);
+                LogNSError("RVCCleanMode ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58046,25 +58507,25 @@ class ReadRefrigeratorAlarmClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRefrigeratorAlarmClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeRvcCleanModeClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeRefrigeratorAlarmClusterRevision()
+    SubscribeAttributeRvcCleanModeClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeRefrigeratorAlarmClusterRevision()
+    ~SubscribeAttributeRvcCleanModeClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterRefrigeratorAlarm 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();
@@ -58078,7 +58539,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(@"RVCCleanMode.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58095,16 +58556,18 @@ class SubscribeAttributeRefrigeratorAlarmClusterRevision : public SubscribeAttri
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster DishwasherMode                                              | 0x0059 |
+| Cluster TemperatureControl                                          | 0x0056 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * ChangeToMode                                                      |   0x00 |
+| * SetTemperature                                                    |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * SupportedModes                                                    | 0x0000 |
-| * CurrentMode                                                       | 0x0001 |
-| * StartUpMode                                                       | 0x0002 |
-| * OnMode                                                            | 0x0003 |
+| * TemperatureSetpoint                                               | 0x0000 |
+| * MinTemperature                                                    | 0x0001 |
+| * MaxTemperature                                                    | 0x0002 |
+| * Step                                                              | 0x0003 |
+| * SelectedTemperatureLevel                                          | 0x0004 |
+| * SupportedTemperatureLevels                                        | 0x0005 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -58117,56 +58580,68 @@ class SubscribeAttributeRefrigeratorAlarmClusterRevision : public SubscribeAttri
 
 #if MTR_ENABLE_PROVISIONAL
 /*
- * Command ChangeToMode
+ * Command SetTemperature
  */
-class DishwasherModeChangeToMode : public ClusterCommand {
+class TemperatureControlSetTemperature : public ClusterCommand {
 public:
-    DishwasherModeChangeToMode()
-        : ClusterCommand("change-to-mode")
+    TemperatureControlSetTemperature()
+        : ClusterCommand("set-temperature")
     {
-        AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode);
+#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::DishwasherMode::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::DishwasherMode::Commands::ChangeToMode::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 = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRDishwasherModeClusterChangeToModeParams 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;
-        params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode];
+#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 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);
-                                                           }
-                                                       }];
+            [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::DishwasherMode::Commands::ChangeToMode::Type mRequest;
+    chip::app::Clusters::TemperatureControl::Commands::SetTemperature::Type mRequest;
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
@@ -58174,34 +58649,34 @@ class DishwasherModeChangeToMode : public ClusterCommand {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute SupportedModes
+ * Attribute TemperatureSetpoint
  */
-class ReadDishwasherModeSupportedModes : public ReadAttribute {
+class ReadTemperatureControlTemperatureSetpoint : public ReadAttribute {
 public:
-    ReadDishwasherModeSupportedModes()
-        : ReadAttribute("supported-modes")
+    ReadTemperatureControlTemperatureSetpoint()
+        : ReadAttribute("temperature-setpoint")
     {
     }
 
-    ~ReadDishwasherModeSupportedModes()
+    ~ReadTemperatureControlTemperatureSetpoint()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherMode.SupportedModes 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("DishwasherMode SupportedModes read Error", error);
+                LogNSError("TemperatureControl TemperatureSetpoint read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58210,25 +58685,25 @@ class ReadDishwasherModeSupportedModes : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherModeSupportedModes : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlTemperatureSetpoint : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeSupportedModes()
-        : SubscribeAttribute("supported-modes")
+    SubscribeAttributeTemperatureControlTemperatureSetpoint()
+        : SubscribeAttribute("temperature-setpoint")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeSupportedModes()
+    ~SubscribeAttributeTemperatureControlTemperatureSetpoint()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherMode 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();
@@ -58239,10 +58714,10 @@ class SubscribeAttributeDishwasherModeSupportedModes : public SubscribeAttribute
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSupportedModesWithParams:params
+        [cluster subscribeAttributeTemperatureSetpointWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherMode.SupportedModes response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureControl.TemperatureSetpoint response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58259,34 +58734,34 @@ class SubscribeAttributeDishwasherModeSupportedModes : public SubscribeAttribute
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute CurrentMode
+ * Attribute MinTemperature
  */
-class ReadDishwasherModeCurrentMode : public ReadAttribute {
+class ReadTemperatureControlMinTemperature : public ReadAttribute {
 public:
-    ReadDishwasherModeCurrentMode()
-        : ReadAttribute("current-mode")
+    ReadTemperatureControlMinTemperature()
+        : ReadAttribute("min-temperature")
     {
     }
 
-    ~ReadDishwasherModeCurrentMode()
+    ~ReadTemperatureControlMinTemperature()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherMode.CurrentMode 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("DishwasherMode CurrentMode read Error", error);
+                LogNSError("TemperatureControl MinTemperature read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58295,25 +58770,25 @@ class ReadDishwasherModeCurrentMode : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherModeCurrentMode : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlMinTemperature : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeCurrentMode()
-        : SubscribeAttribute("current-mode")
+    SubscribeAttributeTemperatureControlMinTemperature()
+        : SubscribeAttribute("min-temperature")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeCurrentMode()
+    ~SubscribeAttributeTemperatureControlMinTemperature()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherMode 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();
@@ -58324,10 +58799,10 @@ class SubscribeAttributeDishwasherModeCurrentMode : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeCurrentModeWithParams:params
+        [cluster subscribeAttributeMinTemperatureWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherMode.CurrentMode response %@", [value description]);
+                NSLog(@"TemperatureControl.MinTemperature response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58344,34 +58819,34 @@ class SubscribeAttributeDishwasherModeCurrentMode : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute StartUpMode
+ * Attribute MaxTemperature
  */
-class ReadDishwasherModeStartUpMode : public ReadAttribute {
+class ReadTemperatureControlMaxTemperature : public ReadAttribute {
 public:
-    ReadDishwasherModeStartUpMode()
-        : ReadAttribute("start-up-mode")
+    ReadTemperatureControlMaxTemperature()
+        : ReadAttribute("max-temperature")
     {
     }
 
-    ~ReadDishwasherModeStartUpMode()
+    ~ReadTemperatureControlMaxTemperature()
     {
     }
 
     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::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 = [[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 = [[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("DishwasherMode StartUpMode read Error", error);
+                LogNSError("TemperatureControl MaxTemperature read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58380,69 +58855,110 @@ class ReadDishwasherModeStartUpMode : public ReadAttribute {
     }
 };
 
-class WriteDishwasherModeStartUpMode : public WriteAttribute {
+class SubscribeAttributeTemperatureControlMaxTemperature : public SubscribeAttribute {
 public:
-    WriteDishwasherModeStartUpMode()
-        : WriteAttribute("start-up-mode")
+    SubscribeAttributeTemperatureControlMaxTemperature()
+        : SubscribeAttribute("max-temperature")
     {
-        AddArgument("attr-name", "start-up-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteDishwasherModeStartUpMode()
+    ~SubscribeAttributeTemperatureControlMaxTemperature()
     {
     }
 
     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::TemperatureControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::MaxTemperature::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 = [[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 subscribeAttributeMaxTemperatureWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureControl.MaxTemperature response %@", [value description]);
+                if (error == nil) {
+                    RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+                } else {
+                    RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+                }
+                SetCommandExitStatus(error);
+            }];
 
-        [cluster writeAttributeStartUpModeWithValue:value params:params completion:^(NSError * _Nullable error) {
-            if (error != nil) {
-                LogNSError("DishwasherMode StartUpMode write Error", error);
+        return CHIP_NO_ERROR;
+    }
+};
+
+#endif // MTR_ENABLE_PROVISIONAL
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute Step
+ */
+class ReadTemperatureControlStep : public ReadAttribute {
+public:
+    ReadTemperatureControlStep()
+        : ReadAttribute("step")
+    {
+    }
+
+    ~ReadTemperatureControlStep()
+    {
+    }
+
+    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;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%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]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("TemperatureControl Step read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
         }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    chip::app::DataModel::Nullable<uint8_t> mValue;
 };
 
-class SubscribeAttributeDishwasherModeStartUpMode : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlStep : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeStartUpMode()
-        : SubscribeAttribute("start-up-mode")
+    SubscribeAttributeTemperatureControlStep()
+        : SubscribeAttribute("step")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeStartUpMode()
+    ~SubscribeAttributeTemperatureControlStep()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherMode 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();
@@ -58453,10 +58969,10 @@ class SubscribeAttributeDishwasherModeStartUpMode : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeStartUpModeWithParams:params
+        [cluster subscribeAttributeStepWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherMode.StartUpMode response %@", [value description]);
+                NSLog(@"TemperatureControl.Step response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58473,34 +58989,34 @@ class SubscribeAttributeDishwasherModeStartUpMode : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute OnMode
+ * Attribute SelectedTemperatureLevel
  */
-class ReadDishwasherModeOnMode : public ReadAttribute {
+class ReadTemperatureControlSelectedTemperatureLevel : public ReadAttribute {
 public:
-    ReadDishwasherModeOnMode()
-        : ReadAttribute("on-mode")
+    ReadTemperatureControlSelectedTemperatureLevel()
+        : ReadAttribute("selected-temperature-level")
     {
     }
 
-    ~ReadDishwasherModeOnMode()
+    ~ReadTemperatureControlSelectedTemperatureLevel()
     {
     }
 
     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::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 = [[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 = [[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("DishwasherMode OnMode read Error", error);
+                LogNSError("TemperatureControl SelectedTemperatureLevel read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58509,69 +59025,110 @@ class ReadDishwasherModeOnMode : public ReadAttribute {
     }
 };
 
-class WriteDishwasherModeOnMode : public WriteAttribute {
+class SubscribeAttributeTemperatureControlSelectedTemperatureLevel : public SubscribeAttribute {
 public:
-    WriteDishwasherModeOnMode()
-        : WriteAttribute("on-mode")
+    SubscribeAttributeTemperatureControlSelectedTemperatureLevel()
+        : SubscribeAttribute("selected-temperature-level")
     {
-        AddArgument("attr-name", "on-mode");
-        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
-        WriteAttribute::AddArguments();
     }
 
-    ~WriteDishwasherModeOnMode()
+    ~SubscribeAttributeTemperatureControlSelectedTemperatureLevel()
     {
     }
 
     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::TemperatureControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::Attributes::SelectedTemperatureLevel::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 = [[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 subscribeAttributeSelectedTemperatureLevelWithParams:params
+            subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"TemperatureControl.SelectedTemperatureLevel 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 SupportedTemperatureLevels
+ */
+class ReadTemperatureControlSupportedTemperatureLevels : public ReadAttribute {
+public:
+    ReadTemperatureControlSupportedTemperatureLevels()
+        : ReadAttribute("supported-temperature-levels")
+    {
+    }
+
+    ~ReadTemperatureControlSupportedTemperatureLevels()
+    {
+    }
+
+    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;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%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]);
+            if (error == nil) {
+                RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
+            } else {
+                LogNSError("TemperatureControl SupportedTemperatureLevels 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 SubscribeAttributeTemperatureControlSupportedTemperatureLevels : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeOnMode()
-        : SubscribeAttribute("on-mode")
+    SubscribeAttributeTemperatureControlSupportedTemperatureLevels()
+        : SubscribeAttribute("supported-temperature-levels")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeOnMode()
+    ~SubscribeAttributeTemperatureControlSupportedTemperatureLevels()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherMode 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();
@@ -58582,10 +59139,10 @@ class SubscribeAttributeDishwasherModeOnMode : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeOnModeWithParams:params
+        [cluster subscribeAttributeSupportedTemperatureLevelsWithParams: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(@"TemperatureControl.SupportedTemperatureLevels response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58604,32 +59161,32 @@ class SubscribeAttributeDishwasherModeOnMode : public SubscribeAttribute {
 /*
  * Attribute GeneratedCommandList
  */
-class ReadDishwasherModeGeneratedCommandList : public ReadAttribute {
+class ReadTemperatureControlGeneratedCommandList : public ReadAttribute {
 public:
-    ReadDishwasherModeGeneratedCommandList()
+    ReadTemperatureControlGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadDishwasherModeGeneratedCommandList()
+    ~ReadTemperatureControlGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherMode.GeneratedCommandList response %@", [value description]);
+            NSLog(@"TemperatureControl.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherMode GeneratedCommandList read Error", error);
+                LogNSError("TemperatureControl GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58638,25 +59195,25 @@ class ReadDishwasherModeGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherModeGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeGeneratedCommandList()
+    SubscribeAttributeTemperatureControlGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeGeneratedCommandList()
+    ~SubscribeAttributeTemperatureControlGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherMode 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();
@@ -58670,7 +59227,7 @@ class SubscribeAttributeDishwasherModeGeneratedCommandList : public SubscribeAtt
         [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherMode.GeneratedCommandList response %@", [value description]);
+                NSLog(@"TemperatureControl.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58689,32 +59246,32 @@ class SubscribeAttributeDishwasherModeGeneratedCommandList : public SubscribeAtt
 /*
  * Attribute AcceptedCommandList
  */
-class ReadDishwasherModeAcceptedCommandList : public ReadAttribute {
+class ReadTemperatureControlAcceptedCommandList : public ReadAttribute {
 public:
-    ReadDishwasherModeAcceptedCommandList()
+    ReadTemperatureControlAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadDishwasherModeAcceptedCommandList()
+    ~ReadTemperatureControlAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherMode.AcceptedCommandList response %@", [value description]);
+            NSLog(@"TemperatureControl.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherMode AcceptedCommandList read Error", error);
+                LogNSError("TemperatureControl AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58723,25 +59280,25 @@ class ReadDishwasherModeAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherModeAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeAcceptedCommandList()
+    SubscribeAttributeTemperatureControlAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeAcceptedCommandList()
+    ~SubscribeAttributeTemperatureControlAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherMode 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();
@@ -58755,7 +59312,7 @@ class SubscribeAttributeDishwasherModeAcceptedCommandList : public SubscribeAttr
         [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherMode.AcceptedCommandList response %@", [value description]);
+                NSLog(@"TemperatureControl.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58774,32 +59331,32 @@ class SubscribeAttributeDishwasherModeAcceptedCommandList : public SubscribeAttr
 /*
  * Attribute EventList
  */
-class ReadDishwasherModeEventList : public ReadAttribute {
+class ReadTemperatureControlEventList : public ReadAttribute {
 public:
-    ReadDishwasherModeEventList()
+    ReadTemperatureControlEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadDishwasherModeEventList()
+    ~ReadTemperatureControlEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherMode.EventList response %@", [value description]);
+            NSLog(@"TemperatureControl.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherMode EventList read Error", error);
+                LogNSError("TemperatureControl EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58808,25 +59365,25 @@ class ReadDishwasherModeEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherModeEventList : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeEventList()
+    SubscribeAttributeTemperatureControlEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeEventList()
+    ~SubscribeAttributeTemperatureControlEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherMode 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();
@@ -58840,7 +59397,7 @@ class SubscribeAttributeDishwasherModeEventList : public SubscribeAttribute {
         [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherMode.EventList response %@", [value description]);
+                NSLog(@"TemperatureControl.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58859,32 +59416,32 @@ class SubscribeAttributeDishwasherModeEventList : public SubscribeAttribute {
 /*
  * Attribute AttributeList
  */
-class ReadDishwasherModeAttributeList : public ReadAttribute {
+class ReadTemperatureControlAttributeList : public ReadAttribute {
 public:
-    ReadDishwasherModeAttributeList()
+    ReadTemperatureControlAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadDishwasherModeAttributeList()
+    ~ReadTemperatureControlAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherMode.AttributeList response %@", [value description]);
+            NSLog(@"TemperatureControl.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherMode AttributeList read Error", error);
+                LogNSError("TemperatureControl AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58893,25 +59450,25 @@ class ReadDishwasherModeAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherModeAttributeList : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeAttributeList()
+    SubscribeAttributeTemperatureControlAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeAttributeList()
+    ~SubscribeAttributeTemperatureControlAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherMode 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();
@@ -58925,7 +59482,7 @@ class SubscribeAttributeDishwasherModeAttributeList : public SubscribeAttribute
         [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherMode.AttributeList response %@", [value description]);
+                NSLog(@"TemperatureControl.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -58944,32 +59501,32 @@ class SubscribeAttributeDishwasherModeAttributeList : public SubscribeAttribute
 /*
  * Attribute FeatureMap
  */
-class ReadDishwasherModeFeatureMap : public ReadAttribute {
+class ReadTemperatureControlFeatureMap : public ReadAttribute {
 public:
-    ReadDishwasherModeFeatureMap()
+    ReadTemperatureControlFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadDishwasherModeFeatureMap()
+    ~ReadTemperatureControlFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherMode.FeatureMap response %@", [value description]);
+            NSLog(@"TemperatureControl.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherMode FeatureMap read Error", error);
+                LogNSError("TemperatureControl FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -58978,25 +59535,25 @@ class ReadDishwasherModeFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherModeFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeFeatureMap()
+    SubscribeAttributeTemperatureControlFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeFeatureMap()
+    ~SubscribeAttributeTemperatureControlFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherMode 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();
@@ -59010,7 +59567,7 @@ class SubscribeAttributeDishwasherModeFeatureMap : public SubscribeAttribute {
         [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherMode.FeatureMap response %@", [value description]);
+                NSLog(@"TemperatureControl.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59029,32 +59586,32 @@ class SubscribeAttributeDishwasherModeFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadDishwasherModeClusterRevision : public ReadAttribute {
+class ReadTemperatureControlClusterRevision : public ReadAttribute {
 public:
-    ReadDishwasherModeClusterRevision()
+    ReadTemperatureControlClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadDishwasherModeClusterRevision()
+    ~ReadTemperatureControlClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherMode.ClusterRevision response %@", [value description]);
+            NSLog(@"TemperatureControl.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("DishwasherMode ClusterRevision read Error", error);
+                LogNSError("TemperatureControl ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59063,25 +59620,25 @@ class ReadDishwasherModeClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherModeClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeTemperatureControlClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherModeClusterRevision()
+    SubscribeAttributeTemperatureControlClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeDishwasherModeClusterRevision()
+    ~SubscribeAttributeTemperatureControlClusterRevision()
     {
     }
 
     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::TemperatureControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::TemperatureControl::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 = [[MTRBaseClusterTemperatureControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -59095,7 +59652,7 @@ class SubscribeAttributeDishwasherModeClusterRevision : public SubscribeAttribut
         [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherMode.ClusterRevision response %@", [value description]);
+                NSLog(@"TemperatureControl.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59112,12 +59669,14 @@ class SubscribeAttributeDishwasherModeClusterRevision : public SubscribeAttribut
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster AirQuality                                                  | 0x005B |
+| Cluster RefrigeratorAlarm                                           | 0x0057 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * AirQuality                                                        | 0x0000 |
+| * Mask                                                              | 0x0000 |
+| * State                                                             | 0x0002 |
+| * Supported                                                         | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -59126,39 +59685,40 @@ class SubscribeAttributeDishwasherModeClusterRevision : public SubscribeAttribut
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
+| * Notify                                                            | 0x0000 |
 \*----------------------------------------------------------------------------*/
 
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AirQuality
+ * Attribute Mask
  */
-class ReadAirQualityAirQuality : public ReadAttribute {
+class ReadRefrigeratorAlarmMask : public ReadAttribute {
 public:
-    ReadAirQualityAirQuality()
-        : ReadAttribute("air-quality")
+    ReadRefrigeratorAlarmMask()
+        : ReadAttribute("mask")
     {
     }
 
-    ~ReadAirQualityAirQuality()
+    ~ReadRefrigeratorAlarmMask()
     {
     }
 
     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::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 = [[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 = [[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("AirQuality AirQuality read Error", error);
+                LogNSError("RefrigeratorAlarm Mask read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59167,25 +59727,25 @@ class ReadAirQualityAirQuality : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAirQualityAirQuality : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAlarmMask : public SubscribeAttribute {
 public:
-    SubscribeAttributeAirQualityAirQuality()
-        : SubscribeAttribute("air-quality")
+    SubscribeAttributeRefrigeratorAlarmMask()
+        : SubscribeAttribute("mask")
     {
     }
 
-    ~SubscribeAttributeAirQualityAirQuality()
+    ~SubscribeAttributeRefrigeratorAlarmMask()
     {
     }
 
     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::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 = [[MTRBaseClusterAirQuality 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();
@@ -59196,10 +59756,10 @@ class SubscribeAttributeAirQualityAirQuality : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAirQualityWithParams:params
+        [cluster subscribeAttributeMaskWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AirQuality.AirQuality response %@", [value description]);
+                NSLog(@"RefrigeratorAlarm.Mask response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59216,34 +59776,34 @@ class SubscribeAttributeAirQualityAirQuality : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute State
  */
-class ReadAirQualityGeneratedCommandList : public ReadAttribute {
+class ReadRefrigeratorAlarmState : public ReadAttribute {
 public:
-    ReadAirQualityGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadRefrigeratorAlarmState()
+        : ReadAttribute("state")
     {
     }
 
-    ~ReadAirQualityGeneratedCommandList()
+    ~ReadRefrigeratorAlarmState()
     {
     }
 
     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::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 = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AirQuality.GeneratedCommandList response %@", [value description]);
+        __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("AirQuality GeneratedCommandList read Error", error);
+                LogNSError("RefrigeratorAlarm State read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59252,25 +59812,25 @@ class ReadAirQualityGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAirQualityGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAlarmState : public SubscribeAttribute {
 public:
-    SubscribeAttributeAirQualityGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeRefrigeratorAlarmState()
+        : SubscribeAttribute("state")
     {
     }
 
-    ~SubscribeAttributeAirQualityGeneratedCommandList()
+    ~SubscribeAttributeRefrigeratorAlarmState()
     {
     }
 
     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::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 = [[MTRBaseClusterAirQuality 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();
@@ -59281,10 +59841,10 @@ class SubscribeAttributeAirQualityGeneratedCommandList : public SubscribeAttribu
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+        [cluster subscribeAttributeStateWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AirQuality.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RefrigeratorAlarm.State response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59301,34 +59861,34 @@ class SubscribeAttributeAirQualityGeneratedCommandList : public SubscribeAttribu
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute Supported
  */
-class ReadAirQualityAcceptedCommandList : public ReadAttribute {
+class ReadRefrigeratorAlarmSupported : public ReadAttribute {
 public:
-    ReadAirQualityAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadRefrigeratorAlarmSupported()
+        : ReadAttribute("supported")
     {
     }
 
-    ~ReadAirQualityAcceptedCommandList()
+    ~ReadRefrigeratorAlarmSupported()
     {
     }
 
     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::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 = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AirQuality.AcceptedCommandList 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("AirQuality AcceptedCommandList read Error", error);
+                LogNSError("RefrigeratorAlarm Supported read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59337,25 +59897,25 @@ class ReadAirQualityAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAirQualityAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAlarmSupported : public SubscribeAttribute {
 public:
-    SubscribeAttributeAirQualityAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeRefrigeratorAlarmSupported()
+        : SubscribeAttribute("supported")
     {
     }
 
-    ~SubscribeAttributeAirQualityAcceptedCommandList()
+    ~SubscribeAttributeRefrigeratorAlarmSupported()
     {
     }
 
     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::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 = [[MTRBaseClusterAirQuality 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();
@@ -59366,10 +59926,10 @@ class SubscribeAttributeAirQualityAcceptedCommandList : public SubscribeAttribut
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+        [cluster subscribeAttributeSupportedWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AirQuality.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RefrigeratorAlarm.Supported response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59386,34 +59946,34 @@ class SubscribeAttributeAirQualityAcceptedCommandList : public SubscribeAttribut
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute EventList
+ * Attribute GeneratedCommandList
  */
-class ReadAirQualityEventList : public ReadAttribute {
+class ReadRefrigeratorAlarmGeneratedCommandList : public ReadAttribute {
 public:
-    ReadAirQualityEventList()
-        : ReadAttribute("event-list")
+    ReadRefrigeratorAlarmGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadAirQualityEventList()
+    ~ReadRefrigeratorAlarmGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AirQuality.EventList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RefrigeratorAlarm.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("AirQuality EventList read Error", error);
+                LogNSError("RefrigeratorAlarm GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59422,25 +59982,25 @@ class ReadAirQualityEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAirQualityEventList : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAlarmGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeAirQualityEventList()
-        : SubscribeAttribute("event-list")
+    SubscribeAttributeRefrigeratorAlarmGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeAirQualityEventList()
+    ~SubscribeAttributeRefrigeratorAlarmGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterAirQuality 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();
@@ -59451,10 +60011,10 @@ class SubscribeAttributeAirQualityEventList : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeEventListWithParams:params
+        [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AirQuality.EventList response %@", [value description]);
+                NSLog(@"RefrigeratorAlarm.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59471,34 +60031,34 @@ class SubscribeAttributeAirQualityEventList : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AttributeList
+ * Attribute AcceptedCommandList
  */
-class ReadAirQualityAttributeList : public ReadAttribute {
+class ReadRefrigeratorAlarmAcceptedCommandList : public ReadAttribute {
 public:
-    ReadAirQualityAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadRefrigeratorAlarmAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadAirQualityAttributeList()
+    ~ReadRefrigeratorAlarmAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AirQuality.AttributeList response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RefrigeratorAlarm.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("AirQuality AttributeList read Error", error);
+                LogNSError("RefrigeratorAlarm AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59507,25 +60067,25 @@ class ReadAirQualityAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAirQualityAttributeList : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAlarmAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeAirQualityAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeRefrigeratorAlarmAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeAirQualityAttributeList()
+    ~SubscribeAttributeRefrigeratorAlarmAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterAirQuality 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();
@@ -59536,10 +60096,10 @@ class SubscribeAttributeAirQualityAttributeList : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAttributeListWithParams:params
+        [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AirQuality.AttributeList response %@", [value description]);
+                NSLog(@"RefrigeratorAlarm.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59556,34 +60116,34 @@ class SubscribeAttributeAirQualityAttributeList : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute FeatureMap
+ * Attribute EventList
  */
-class ReadAirQualityFeatureMap : public ReadAttribute {
+class ReadRefrigeratorAlarmEventList : public ReadAttribute {
 public:
-    ReadAirQualityFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadRefrigeratorAlarmEventList()
+        : ReadAttribute("event-list")
     {
     }
 
-    ~ReadAirQualityFeatureMap()
+    ~ReadRefrigeratorAlarmEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AirQuality.FeatureMap response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RefrigeratorAlarm.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("AirQuality FeatureMap read Error", error);
+                LogNSError("RefrigeratorAlarm EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59592,25 +60152,25 @@ class ReadAirQualityFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAirQualityFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAlarmEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeAirQualityFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeRefrigeratorAlarmEventList()
+        : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeAirQualityFeatureMap()
+    ~SubscribeAttributeRefrigeratorAlarmEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterAirQuality 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();
@@ -59621,10 +60181,10 @@ class SubscribeAttributeAirQualityFeatureMap : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeFeatureMapWithParams:params
+        [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AirQuality.FeatureMap response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RefrigeratorAlarm.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59641,34 +60201,34 @@ class SubscribeAttributeAirQualityFeatureMap : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ClusterRevision
+ * Attribute AttributeList
  */
-class ReadAirQualityClusterRevision : public ReadAttribute {
+class ReadRefrigeratorAlarmAttributeList : public ReadAttribute {
 public:
-    ReadAirQualityClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadRefrigeratorAlarmAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadAirQualityClusterRevision()
+    ~ReadRefrigeratorAlarmAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"AirQuality.ClusterRevision response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RefrigeratorAlarm.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("AirQuality ClusterRevision read Error", error);
+                LogNSError("RefrigeratorAlarm AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59677,25 +60237,25 @@ class ReadAirQualityClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeAirQualityClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAlarmAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeAirQualityClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeRefrigeratorAlarmAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeAirQualityClusterRevision()
+    ~SubscribeAttributeRefrigeratorAlarmAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterAirQuality 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();
@@ -59706,10 +60266,10 @@ class SubscribeAttributeAirQualityClusterRevision : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeClusterRevisionWithParams:params
+        [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"AirQuality.ClusterRevision response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"RefrigeratorAlarm.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59723,127 +60283,37 @@ class SubscribeAttributeAirQualityClusterRevision : public SubscribeAttribute {
 };
 
 #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
-/*
- * Command SelfTestRequest
- */
-class SmokeCoAlarmSelfTestRequest : public ClusterCommand {
-public:
-    SmokeCoAlarmSelfTestRequest()
-        : ClusterCommand("self-test-request")
-    {
-        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;
-
-        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
+ * Attribute FeatureMap
  */
-class ReadSmokeCoAlarmExpressedState : public ReadAttribute {
+class ReadRefrigeratorAlarmFeatureMap : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmExpressedState()
-        : ReadAttribute("expressed-state")
+    ReadRefrigeratorAlarmFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadSmokeCoAlarmExpressedState()
+    ~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::ExpressedState::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];
-        [cluster readAttributeExpressedStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.ExpressedState response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RefrigeratorAlarm.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm ExpressedState read Error", error);
+                LogNSError("RefrigeratorAlarm FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59852,25 +60322,25 @@ class ReadSmokeCoAlarmExpressedState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmExpressedState : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAlarmFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmExpressedState()
-        : SubscribeAttribute("expressed-state")
+    SubscribeAttributeRefrigeratorAlarmFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmExpressedState()
+    ~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::ExpressedState::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();
@@ -59881,10 +60351,10 @@ class SubscribeAttributeSmokeCoAlarmExpressedState : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeExpressedStateWithParams:params
+        [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.ExpressedState response %@", [value description]);
+                NSLog(@"RefrigeratorAlarm.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59901,34 +60371,34 @@ class SubscribeAttributeSmokeCoAlarmExpressedState : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute SmokeState
+ * Attribute ClusterRevision
  */
-class ReadSmokeCoAlarmSmokeState : public ReadAttribute {
+class ReadRefrigeratorAlarmClusterRevision : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmSmokeState()
-        : ReadAttribute("smoke-state")
+    ReadRefrigeratorAlarmClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadSmokeCoAlarmSmokeState()
+    ~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::SmokeState::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];
-        [cluster readAttributeSmokeStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.SmokeState response %@", [value description]);
+        __auto_type * cluster = [[MTRBaseClusterRefrigeratorAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"RefrigeratorAlarm.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm SmokeState read Error", error);
+                LogNSError("RefrigeratorAlarm ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -59937,25 +60407,25 @@ class ReadSmokeCoAlarmSmokeState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmSmokeState : public SubscribeAttribute {
+class SubscribeAttributeRefrigeratorAlarmClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmSmokeState()
-        : SubscribeAttribute("smoke-state")
+    SubscribeAttributeRefrigeratorAlarmClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmSmokeState()
+    ~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::SmokeState::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();
@@ -59966,10 +60436,10 @@ class SubscribeAttributeSmokeCoAlarmSmokeState : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSmokeStateWithParams:params
+        [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.SmokeState response %@", [value description]);
+                NSLog(@"RefrigeratorAlarm.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -59982,65 +60452,148 @@ class SubscribeAttributeSmokeCoAlarmSmokeState : public SubscribeAttribute {
     }
 };
 
+#endif // MTR_ENABLE_PROVISIONAL
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
+/*----------------------------------------------------------------------------*\
+| 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:                                                             |        |
+\*----------------------------------------------------------------------------*/
 
+#if MTR_ENABLE_PROVISIONAL
 /*
- * Attribute COState
+ * Command ChangeToMode
  */
-class ReadSmokeCoAlarmCOState : public ReadAttribute {
+class DishwasherModeChangeToMode : public ClusterCommand {
 public:
-    ReadSmokeCoAlarmCOState()
-        : ReadAttribute("costate")
-    {
-    }
-
-    ~ReadSmokeCoAlarmCOState()
+    DishwasherModeChangeToMode()
+        : 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::SmokeCoAlarm::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::COState::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 ") 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 = [[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("SmokeCOAlarm COState read Error", error);
-                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
-            }
-            SetCommandExitStatus(error);
-        }];
-        return CHIP_NO_ERROR;
+        __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;
+#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) {
+                                                           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::DishwasherMode::Commands::ChangeToMode::Type mRequest;
 };
 
-class SubscribeAttributeSmokeCoAlarmCOState : public SubscribeAttribute {
+#endif // MTR_ENABLE_PROVISIONAL
+
+#if MTR_ENABLE_PROVISIONAL
+
+/*
+ * Attribute SupportedModes
+ */
+class ReadDishwasherModeSupportedModes : public ReadAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmCOState()
-        : SubscribeAttribute("costate")
+    ReadDishwasherModeSupportedModes()
+        : ReadAttribute("supported-modes")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmCOState()
+    ~ReadDishwasherModeSupportedModes()
     {
     }
 
     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::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 = [[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("DishwasherMode SupportedModes read Error", error);
+                RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
+            }
+            SetCommandExitStatus(error);
+        }];
+        return CHIP_NO_ERROR;
+    }
+};
+
+class SubscribeAttributeDishwasherModeSupportedModes : public SubscribeAttribute {
+public:
+    SubscribeAttributeDishwasherModeSupportedModes()
+        : SubscribeAttribute("supported-modes")
+    {
+    }
+
+    ~SubscribeAttributeDishwasherModeSupportedModes()
+    {
+    }
+
+    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;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%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 = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -60051,10 +60604,10 @@ class SubscribeAttributeSmokeCoAlarmCOState : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeCOStateWithParams:params
+        [cluster subscribeAttributeSupportedModesWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.COState 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 {
@@ -60071,34 +60624,34 @@ class SubscribeAttributeSmokeCoAlarmCOState : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute BatteryAlert
+ * Attribute CurrentMode
  */
-class ReadSmokeCoAlarmBatteryAlert : public ReadAttribute {
+class ReadDishwasherModeCurrentMode : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmBatteryAlert()
-        : ReadAttribute("battery-alert")
+    ReadDishwasherModeCurrentMode()
+        : ReadAttribute("current-mode")
     {
     }
 
-    ~ReadSmokeCoAlarmBatteryAlert()
+    ~ReadDishwasherModeCurrentMode()
     {
     }
 
     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::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 = [[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 = [[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("SmokeCOAlarm BatteryAlert read Error", error);
+                LogNSError("DishwasherMode CurrentMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60107,25 +60660,25 @@ class ReadSmokeCoAlarmBatteryAlert : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmBatteryAlert : public SubscribeAttribute {
+class SubscribeAttributeDishwasherModeCurrentMode : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmBatteryAlert()
-        : SubscribeAttribute("battery-alert")
+    SubscribeAttributeDishwasherModeCurrentMode()
+        : SubscribeAttribute("current-mode")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmBatteryAlert()
+    ~SubscribeAttributeDishwasherModeCurrentMode()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm 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();
@@ -60136,10 +60689,10 @@ class SubscribeAttributeSmokeCoAlarmBatteryAlert : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeBatteryAlertWithParams:params
+        [cluster subscribeAttributeCurrentModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.BatteryAlert response %@", [value description]);
+                NSLog(@"DishwasherMode.CurrentMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60156,34 +60709,34 @@ class SubscribeAttributeSmokeCoAlarmBatteryAlert : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute DeviceMuted
+ * Attribute StartUpMode
  */
-class ReadSmokeCoAlarmDeviceMuted : public ReadAttribute {
+class ReadDishwasherModeStartUpMode : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmDeviceMuted()
-        : ReadAttribute("device-muted")
+    ReadDishwasherModeStartUpMode()
+        : ReadAttribute("start-up-mode")
     {
     }
 
-    ~ReadSmokeCoAlarmDeviceMuted()
+    ~ReadDishwasherModeStartUpMode()
     {
     }
 
     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::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 = [[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 = [[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("SmokeCOAlarm DeviceMuted read Error", error);
+                LogNSError("DishwasherMode StartUpMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60192,25 +60745,69 @@ class ReadSmokeCoAlarmDeviceMuted : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmDeviceMuted : public SubscribeAttribute {
+class WriteDishwasherModeStartUpMode : public WriteAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmDeviceMuted()
-        : SubscribeAttribute("device-muted")
+    WriteDishwasherModeStartUpMode()
+        : WriteAttribute("start-up-mode")
     {
+        AddArgument("attr-name", "start-up-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeSmokeCoAlarmDeviceMuted()
+    ~WriteDishwasherModeStartUpMode()
     {
     }
 
     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::DishwasherMode::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DishwasherMode::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 = [[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 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 SubscribeAttributeDishwasherModeStartUpMode : public SubscribeAttribute {
+public:
+    SubscribeAttributeDishwasherModeStartUpMode()
+        : SubscribeAttribute("start-up-mode")
+    {
+    }
+
+    ~SubscribeAttributeDishwasherModeStartUpMode()
+    {
+    }
+
+    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;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%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 = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -60221,10 +60818,10 @@ class SubscribeAttributeSmokeCoAlarmDeviceMuted : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeDeviceMutedWithParams:params
+        [cluster subscribeAttributeStartUpModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.DeviceMuted response %@", [value description]);
+                NSLog(@"DishwasherMode.StartUpMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60241,34 +60838,34 @@ class SubscribeAttributeSmokeCoAlarmDeviceMuted : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute TestInProgress
+ * Attribute OnMode
  */
-class ReadSmokeCoAlarmTestInProgress : public ReadAttribute {
+class ReadDishwasherModeOnMode : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmTestInProgress()
-        : ReadAttribute("test-in-progress")
+    ReadDishwasherModeOnMode()
+        : ReadAttribute("on-mode")
     {
     }
 
-    ~ReadSmokeCoAlarmTestInProgress()
+    ~ReadDishwasherModeOnMode()
     {
     }
 
     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::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 = [[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 = [[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("SmokeCOAlarm TestInProgress read Error", error);
+                LogNSError("DishwasherMode OnMode read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60277,25 +60874,69 @@ class ReadSmokeCoAlarmTestInProgress : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmTestInProgress : public SubscribeAttribute {
+class WriteDishwasherModeOnMode : public WriteAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmTestInProgress()
-        : SubscribeAttribute("test-in-progress")
+    WriteDishwasherModeOnMode()
+        : WriteAttribute("on-mode")
     {
+        AddArgument("attr-name", "on-mode");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeSmokeCoAlarmTestInProgress()
+    ~WriteDishwasherModeOnMode()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm 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();
@@ -60306,10 +60947,10 @@ class SubscribeAttributeSmokeCoAlarmTestInProgress : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeTestInProgressWithParams:params
+        [cluster subscribeAttributeOnModeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.TestInProgress response %@", [value description]);
+                NSLog(@"DishwasherMode.OnMode response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60326,34 +60967,34 @@ class SubscribeAttributeSmokeCoAlarmTestInProgress : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute HardwareFaultAlert
+ * Attribute GeneratedCommandList
  */
-class ReadSmokeCoAlarmHardwareFaultAlert : public ReadAttribute {
+class ReadDishwasherModeGeneratedCommandList : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmHardwareFaultAlert()
-        : ReadAttribute("hardware-fault-alert")
+    ReadDishwasherModeGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadSmokeCoAlarmHardwareFaultAlert()
+    ~ReadDishwasherModeGeneratedCommandList()
     {
     }
 
     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::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 = [[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 = [[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("SmokeCOAlarm HardwareFaultAlert read Error", error);
+                LogNSError("DishwasherMode GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60362,25 +61003,25 @@ class ReadSmokeCoAlarmHardwareFaultAlert : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmHardwareFaultAlert : public SubscribeAttribute {
+class SubscribeAttributeDishwasherModeGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmHardwareFaultAlert()
-        : SubscribeAttribute("hardware-fault-alert")
+    SubscribeAttributeDishwasherModeGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmHardwareFaultAlert()
+    ~SubscribeAttributeDishwasherModeGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm 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();
@@ -60391,10 +61032,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(@"DishwasherMode.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60411,34 +61052,34 @@ class SubscribeAttributeSmokeCoAlarmHardwareFaultAlert : public SubscribeAttribu
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute EndOfServiceAlert
+ * Attribute AcceptedCommandList
  */
-class ReadSmokeCoAlarmEndOfServiceAlert : public ReadAttribute {
+class ReadDishwasherModeAcceptedCommandList : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmEndOfServiceAlert()
-        : ReadAttribute("end-of-service-alert")
+    ReadDishwasherModeAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadSmokeCoAlarmEndOfServiceAlert()
+    ~ReadDishwasherModeAcceptedCommandList()
     {
     }
 
     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::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 = [[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 = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherMode.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm EndOfServiceAlert read Error", error);
+                LogNSError("DishwasherMode AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60447,25 +61088,25 @@ class ReadSmokeCoAlarmEndOfServiceAlert : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmEndOfServiceAlert : public SubscribeAttribute {
+class SubscribeAttributeDishwasherModeAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmEndOfServiceAlert()
-        : SubscribeAttribute("end-of-service-alert")
+    SubscribeAttributeDishwasherModeAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmEndOfServiceAlert()
+    ~SubscribeAttributeDishwasherModeAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm 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();
@@ -60476,10 +61117,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(@"DishwasherMode.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60496,34 +61137,34 @@ class SubscribeAttributeSmokeCoAlarmEndOfServiceAlert : public SubscribeAttribut
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute InterconnectSmokeAlarm
+ * Attribute EventList
  */
-class ReadSmokeCoAlarmInterconnectSmokeAlarm : public ReadAttribute {
+class ReadDishwasherModeEventList : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmInterconnectSmokeAlarm()
-        : ReadAttribute("interconnect-smoke-alarm")
+    ReadDishwasherModeEventList()
+        : ReadAttribute("event-list")
     {
     }
 
-    ~ReadSmokeCoAlarmInterconnectSmokeAlarm()
+    ~ReadDishwasherModeEventList()
     {
     }
 
     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::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 = [[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 = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherMode.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm InterconnectSmokeAlarm read Error", error);
+                LogNSError("DishwasherMode EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60532,25 +61173,25 @@ class ReadSmokeCoAlarmInterconnectSmokeAlarm : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmInterconnectSmokeAlarm : public SubscribeAttribute {
+class SubscribeAttributeDishwasherModeEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmInterconnectSmokeAlarm()
-        : SubscribeAttribute("interconnect-smoke-alarm")
+    SubscribeAttributeDishwasherModeEventList()
+        : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmInterconnectSmokeAlarm()
+    ~SubscribeAttributeDishwasherModeEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm 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();
@@ -60561,10 +61202,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(@"DishwasherMode.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60581,34 +61222,34 @@ class SubscribeAttributeSmokeCoAlarmInterconnectSmokeAlarm : public SubscribeAtt
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute InterconnectCOAlarm
+ * Attribute AttributeList
  */
-class ReadSmokeCoAlarmInterconnectCOAlarm : public ReadAttribute {
+class ReadDishwasherModeAttributeList : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmInterconnectCOAlarm()
-        : ReadAttribute("interconnect-coalarm")
+    ReadDishwasherModeAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadSmokeCoAlarmInterconnectCOAlarm()
+    ~ReadDishwasherModeAttributeList()
     {
     }
 
     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::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 = [[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 = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherMode.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm InterconnectCOAlarm read Error", error);
+                LogNSError("DishwasherMode AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60617,25 +61258,25 @@ class ReadSmokeCoAlarmInterconnectCOAlarm : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmInterconnectCOAlarm : public SubscribeAttribute {
+class SubscribeAttributeDishwasherModeAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmInterconnectCOAlarm()
-        : SubscribeAttribute("interconnect-coalarm")
+    SubscribeAttributeDishwasherModeAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmInterconnectCOAlarm()
+    ~SubscribeAttributeDishwasherModeAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm 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();
@@ -60646,10 +61287,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(@"DishwasherMode.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60666,34 +61307,34 @@ class SubscribeAttributeSmokeCoAlarmInterconnectCOAlarm : public SubscribeAttrib
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ContaminationState
+ * Attribute FeatureMap
  */
-class ReadSmokeCoAlarmContaminationState : public ReadAttribute {
+class ReadDishwasherModeFeatureMap : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmContaminationState()
-        : ReadAttribute("contamination-state")
+    ReadDishwasherModeFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadSmokeCoAlarmContaminationState()
+    ~ReadDishwasherModeFeatureMap()
     {
     }
 
     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::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 = [[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 = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherMode.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm ContaminationState read Error", error);
+                LogNSError("DishwasherMode FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60702,25 +61343,25 @@ class ReadSmokeCoAlarmContaminationState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmContaminationState : public SubscribeAttribute {
+class SubscribeAttributeDishwasherModeFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmContaminationState()
-        : SubscribeAttribute("contamination-state")
+    SubscribeAttributeDishwasherModeFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmContaminationState()
+    ~SubscribeAttributeDishwasherModeFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm 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();
@@ -60731,10 +61372,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(@"DishwasherMode.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60751,102 +61392,61 @@ class SubscribeAttributeSmokeCoAlarmContaminationState : public SubscribeAttribu
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute SmokeSensitivityLevel
+ * Attribute ClusterRevision
  */
-class ReadSmokeCoAlarmSmokeSensitivityLevel : public ReadAttribute {
+class ReadDishwasherModeClusterRevision : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmSmokeSensitivityLevel()
-        : ReadAttribute("smoke-sensitivity-level")
+    ReadDishwasherModeClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadSmokeCoAlarmSmokeSensitivityLevel()
+    ~ReadDishwasherModeClusterRevision()
     {
     }
 
     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::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 = [[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 = [[MTRBaseClusterDishwasherMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DishwasherMode.ClusterRevision 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);
+                LogNSError("DishwasherMode ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
         }];
         return CHIP_NO_ERROR;
     }
-
-private:
-    uint8_t mValue;
 };
 
-class SubscribeAttributeSmokeCoAlarmSmokeSensitivityLevel : public SubscribeAttribute {
+class SubscribeAttributeDishwasherModeClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmSmokeSensitivityLevel()
-        : SubscribeAttribute("smoke-sensitivity-level")
+    SubscribeAttributeDishwasherModeClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmSmokeSensitivityLevel()
+    ~SubscribeAttributeDishwasherModeClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm 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();
@@ -60857,10 +61457,10 @@ class SubscribeAttributeSmokeCoAlarmSmokeSensitivityLevel : public SubscribeAttr
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSmokeSensitivityLevelWithParams:params
+        [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.SmokeSensitivityLevel response %@", [value description]);
+                NSLog(@"DishwasherMode.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60874,37 +61474,56 @@ class SubscribeAttributeSmokeCoAlarmSmokeSensitivityLevel : public SubscribeAttr
 };
 
 #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 ExpiryDate
+ * Attribute AirQuality
  */
-class ReadSmokeCoAlarmExpiryDate : public ReadAttribute {
+class ReadAirQualityAirQuality : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmExpiryDate()
-        : ReadAttribute("expiry-date")
+    ReadAirQualityAirQuality()
+        : ReadAttribute("air-quality")
     {
     }
 
-    ~ReadSmokeCoAlarmExpiryDate()
+    ~ReadAirQualityAirQuality()
     {
     }
 
     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::AirQuality::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::AirQuality::Attributes::AirQuality::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%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 = [[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("SmokeCOAlarm ExpiryDate read Error", error);
+                LogNSError("AirQuality AirQuality read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60913,25 +61532,25 @@ class ReadSmokeCoAlarmExpiryDate : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmExpiryDate : public SubscribeAttribute {
+class SubscribeAttributeAirQualityAirQuality : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmExpiryDate()
-        : SubscribeAttribute("expiry-date")
+    SubscribeAttributeAirQualityAirQuality()
+        : SubscribeAttribute("air-quality")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmExpiryDate()
+    ~SubscribeAttributeAirQualityAirQuality()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm 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();
@@ -60942,10 +61561,10 @@ class SubscribeAttributeSmokeCoAlarmExpiryDate : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeExpiryDateWithParams:params
+        [cluster subscribeAttributeAirQualityWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"SmokeCOAlarm.ExpiryDate response %@", [value description]);
+                NSLog(@"AirQuality.AirQuality response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -60964,32 +61583,32 @@ class SubscribeAttributeSmokeCoAlarmExpiryDate : public SubscribeAttribute {
 /*
  * Attribute GeneratedCommandList
  */
-class ReadSmokeCoAlarmGeneratedCommandList : public ReadAttribute {
+class ReadAirQualityGeneratedCommandList : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmGeneratedCommandList()
+    ReadAirQualityGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadSmokeCoAlarmGeneratedCommandList()
+    ~ReadAirQualityGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.GeneratedCommandList response %@", [value description]);
+            NSLog(@"AirQuality.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm GeneratedCommandList read Error", error);
+                LogNSError("AirQuality GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -60998,25 +61617,25 @@ class ReadSmokeCoAlarmGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeAirQualityGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmGeneratedCommandList()
+    SubscribeAttributeAirQualityGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmGeneratedCommandList()
+    ~SubscribeAttributeAirQualityGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm 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();
@@ -61030,7 +61649,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(@"AirQuality.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -61049,32 +61668,32 @@ class SubscribeAttributeSmokeCoAlarmGeneratedCommandList : public SubscribeAttri
 /*
  * Attribute AcceptedCommandList
  */
-class ReadSmokeCoAlarmAcceptedCommandList : public ReadAttribute {
+class ReadAirQualityAcceptedCommandList : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmAcceptedCommandList()
+    ReadAirQualityAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadSmokeCoAlarmAcceptedCommandList()
+    ~ReadAirQualityAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.AcceptedCommandList response %@", [value description]);
+            NSLog(@"AirQuality.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm AcceptedCommandList read Error", error);
+                LogNSError("AirQuality AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61083,25 +61702,25 @@ class ReadSmokeCoAlarmAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeAirQualityAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmAcceptedCommandList()
+    SubscribeAttributeAirQualityAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmAcceptedCommandList()
+    ~SubscribeAttributeAirQualityAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm 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();
@@ -61115,7 +61734,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(@"AirQuality.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -61134,32 +61753,32 @@ class SubscribeAttributeSmokeCoAlarmAcceptedCommandList : public SubscribeAttrib
 /*
  * Attribute EventList
  */
-class ReadSmokeCoAlarmEventList : public ReadAttribute {
+class ReadAirQualityEventList : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmEventList()
+    ReadAirQualityEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadSmokeCoAlarmEventList()
+    ~ReadAirQualityEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.EventList response %@", [value description]);
+            NSLog(@"AirQuality.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm EventList read Error", error);
+                LogNSError("AirQuality EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61168,25 +61787,25 @@ class ReadSmokeCoAlarmEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmEventList : public SubscribeAttribute {
+class SubscribeAttributeAirQualityEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmEventList()
+    SubscribeAttributeAirQualityEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmEventList()
+    ~SubscribeAttributeAirQualityEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm 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();
@@ -61200,7 +61819,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(@"AirQuality.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -61219,32 +61838,32 @@ class SubscribeAttributeSmokeCoAlarmEventList : public SubscribeAttribute {
 /*
  * Attribute AttributeList
  */
-class ReadSmokeCoAlarmAttributeList : public ReadAttribute {
+class ReadAirQualityAttributeList : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmAttributeList()
+    ReadAirQualityAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadSmokeCoAlarmAttributeList()
+    ~ReadAirQualityAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.AttributeList response %@", [value description]);
+            NSLog(@"AirQuality.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm AttributeList read Error", error);
+                LogNSError("AirQuality AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61253,25 +61872,25 @@ class ReadSmokeCoAlarmAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmAttributeList : public SubscribeAttribute {
+class SubscribeAttributeAirQualityAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmAttributeList()
+    SubscribeAttributeAirQualityAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmAttributeList()
+    ~SubscribeAttributeAirQualityAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm 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();
@@ -61285,7 +61904,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(@"AirQuality.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -61304,32 +61923,32 @@ class SubscribeAttributeSmokeCoAlarmAttributeList : public SubscribeAttribute {
 /*
  * Attribute FeatureMap
  */
-class ReadSmokeCoAlarmFeatureMap : public ReadAttribute {
+class ReadAirQualityFeatureMap : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmFeatureMap()
+    ReadAirQualityFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadSmokeCoAlarmFeatureMap()
+    ~ReadAirQualityFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.FeatureMap response %@", [value description]);
+            NSLog(@"AirQuality.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm FeatureMap read Error", error);
+                LogNSError("AirQuality FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61338,25 +61957,25 @@ class ReadSmokeCoAlarmFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeAirQualityFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmFeatureMap()
+    SubscribeAttributeAirQualityFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmFeatureMap()
+    ~SubscribeAttributeAirQualityFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm 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();
@@ -61370,7 +61989,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(@"AirQuality.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -61389,32 +62008,32 @@ class SubscribeAttributeSmokeCoAlarmFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadSmokeCoAlarmClusterRevision : public ReadAttribute {
+class ReadAirQualityClusterRevision : public ReadAttribute {
 public:
-    ReadSmokeCoAlarmClusterRevision()
+    ReadAirQualityClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadSmokeCoAlarmClusterRevision()
+    ~ReadAirQualityClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterAirQuality alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"SmokeCOAlarm.ClusterRevision response %@", [value description]);
+            NSLog(@"AirQuality.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("SmokeCOAlarm ClusterRevision read Error", error);
+                LogNSError("AirQuality ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61423,25 +62042,25 @@ class ReadSmokeCoAlarmClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeSmokeCoAlarmClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeAirQualityClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeSmokeCoAlarmClusterRevision()
+    SubscribeAttributeAirQualityClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeSmokeCoAlarmClusterRevision()
+    ~SubscribeAttributeAirQualityClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterSmokeCOAlarm 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();
@@ -61455,7 +62074,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(@"AirQuality.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -61472,17 +62091,25 @@ class SubscribeAttributeSmokeCoAlarmClusterRevision : public SubscribeAttribute
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster DishwasherAlarm                                             | 0x005D |
+| Cluster SmokeCoAlarm                                                | 0x005C |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * Reset                                                             |   0x00 |
-| * ModifyEnabledAlarms                                               |   0x01 |
+| * SelfTestRequest                                                   |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * Mask                                                              | 0x0000 |
-| * Latch                                                             | 0x0001 |
-| * State                                                             | 0x0002 |
-| * Supported                                                         | 0x0003 |
+| * 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 |
@@ -61491,104 +62118,62 @@ class SubscribeAttributeSmokeCoAlarmClusterRevision : public SubscribeAttribute
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
-| * Notify                                                            | 0x0000 |
+| * 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 Reset
- */
-class DishwasherAlarmReset : public ClusterCommand {
-public:
-    DishwasherAlarmReset()
-        : ClusterCommand("reset")
-    {
-        AddArgument("Alarms", 0, UINT32_MAX, &mRequest.alarms);
-        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;
-        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
+ * Command SelfTestRequest
  */
-class DishwasherAlarmModifyEnabledAlarms : public ClusterCommand {
+class SmokeCoAlarmSelfTestRequest : public ClusterCommand {
 public:
-    DishwasherAlarmModifyEnabledAlarms()
-        : ClusterCommand("modify-enabled-alarms")
+    SmokeCoAlarmSelfTestRequest()
+        : ClusterCommand("self-test-request")
     {
-        AddArgument("Mask", 0, UINT32_MAX, &mRequest.mask);
         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::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 = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTRDishwasherAlarmClusterModifyEnabledAlarmsParams alloc] init];
+        __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;
-        params.mask = [NSNumber numberWithUnsignedInt:mRequest.mask.Raw()];
         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 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:
-    chip::app::Clusters::DishwasherAlarm::Commands::ModifyEnabledAlarms::Type mRequest;
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
@@ -61596,34 +62181,34 @@ class DishwasherAlarmModifyEnabledAlarms : public ClusterCommand {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute Mask
+ * Attribute ExpressedState
  */
-class ReadDishwasherAlarmMask : public ReadAttribute {
+class ReadSmokeCoAlarmExpressedState : public ReadAttribute {
 public:
-    ReadDishwasherAlarmMask()
-        : ReadAttribute("mask")
+    ReadSmokeCoAlarmExpressedState()
+        : ReadAttribute("expressed-state")
     {
     }
 
-    ~ReadDishwasherAlarmMask()
+    ~ReadSmokeCoAlarmExpressedState()
     {
     }
 
     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::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 = [[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 = [[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("DishwasherAlarm Mask read Error", error);
+                LogNSError("SmokeCOAlarm ExpressedState read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61632,25 +62217,25 @@ class ReadDishwasherAlarmMask : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherAlarmMask : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmExpressedState : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmMask()
-        : SubscribeAttribute("mask")
+    SubscribeAttributeSmokeCoAlarmExpressedState()
+        : SubscribeAttribute("expressed-state")
     {
     }
 
-    ~SubscribeAttributeDishwasherAlarmMask()
+    ~SubscribeAttributeSmokeCoAlarmExpressedState()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherAlarm 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();
@@ -61661,10 +62246,10 @@ class SubscribeAttributeDishwasherAlarmMask : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeMaskWithParams:params
+        [cluster subscribeAttributeExpressedStateWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.Mask response %@", [value description]);
+                NSLog(@"SmokeCOAlarm.ExpressedState response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -61681,34 +62266,34 @@ class SubscribeAttributeDishwasherAlarmMask : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute Latch
+ * Attribute SmokeState
  */
-class ReadDishwasherAlarmLatch : public ReadAttribute {
+class ReadSmokeCoAlarmSmokeState : public ReadAttribute {
 public:
-    ReadDishwasherAlarmLatch()
-        : ReadAttribute("latch")
+    ReadSmokeCoAlarmSmokeState()
+        : ReadAttribute("smoke-state")
     {
     }
 
-    ~ReadDishwasherAlarmLatch()
+    ~ReadSmokeCoAlarmSmokeState()
     {
     }
 
     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::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 = [[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 = [[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("DishwasherAlarm Latch read Error", error);
+                LogNSError("SmokeCOAlarm SmokeState read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61717,25 +62302,25 @@ class ReadDishwasherAlarmLatch : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherAlarmLatch : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmSmokeState : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmLatch()
-        : SubscribeAttribute("latch")
+    SubscribeAttributeSmokeCoAlarmSmokeState()
+        : SubscribeAttribute("smoke-state")
     {
     }
 
-    ~SubscribeAttributeDishwasherAlarmLatch()
+    ~SubscribeAttributeSmokeCoAlarmSmokeState()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherAlarm 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();
@@ -61746,10 +62331,10 @@ class SubscribeAttributeDishwasherAlarmLatch : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeLatchWithParams:params
+        [cluster subscribeAttributeSmokeStateWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.Latch response %@", [value description]);
+                NSLog(@"SmokeCOAlarm.SmokeState response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -61766,34 +62351,34 @@ class SubscribeAttributeDishwasherAlarmLatch : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute State
+ * Attribute COState
  */
-class ReadDishwasherAlarmState : public ReadAttribute {
+class ReadSmokeCoAlarmCOState : public ReadAttribute {
 public:
-    ReadDishwasherAlarmState()
-        : ReadAttribute("state")
+    ReadSmokeCoAlarmCOState()
+        : ReadAttribute("costate")
     {
     }
 
-    ~ReadDishwasherAlarmState()
+    ~ReadSmokeCoAlarmCOState()
     {
     }
 
     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::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 = [[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 = [[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("DishwasherAlarm State read Error", error);
+                LogNSError("SmokeCOAlarm COState read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61802,25 +62387,25 @@ class ReadDishwasherAlarmState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherAlarmState : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmCOState : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmState()
-        : SubscribeAttribute("state")
+    SubscribeAttributeSmokeCoAlarmCOState()
+        : SubscribeAttribute("costate")
     {
     }
 
-    ~SubscribeAttributeDishwasherAlarmState()
+    ~SubscribeAttributeSmokeCoAlarmCOState()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherAlarm 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();
@@ -61831,10 +62416,10 @@ class SubscribeAttributeDishwasherAlarmState : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeStateWithParams:params
+        [cluster subscribeAttributeCOStateWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.State response %@", [value description]);
+                NSLog(@"SmokeCOAlarm.COState response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -61851,34 +62436,34 @@ class SubscribeAttributeDishwasherAlarmState : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute Supported
+ * Attribute BatteryAlert
  */
-class ReadDishwasherAlarmSupported : public ReadAttribute {
+class ReadSmokeCoAlarmBatteryAlert : public ReadAttribute {
 public:
-    ReadDishwasherAlarmSupported()
-        : ReadAttribute("supported")
+    ReadSmokeCoAlarmBatteryAlert()
+        : ReadAttribute("battery-alert")
     {
     }
 
-    ~ReadDishwasherAlarmSupported()
+    ~ReadSmokeCoAlarmBatteryAlert()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeSupportedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherAlarm.Supported 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("DishwasherAlarm Supported read Error", error);
+                LogNSError("SmokeCOAlarm BatteryAlert read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61887,25 +62472,25 @@ class ReadDishwasherAlarmSupported : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherAlarmSupported : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmBatteryAlert : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmSupported()
-        : SubscribeAttribute("supported")
+    SubscribeAttributeSmokeCoAlarmBatteryAlert()
+        : SubscribeAttribute("battery-alert")
     {
     }
 
-    ~SubscribeAttributeDishwasherAlarmSupported()
+    ~SubscribeAttributeSmokeCoAlarmBatteryAlert()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherAlarm 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();
@@ -61916,10 +62501,10 @@ class SubscribeAttributeDishwasherAlarmSupported : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSupportedWithParams:params
+        [cluster subscribeAttributeBatteryAlertWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.Supported response %@", [value description]);
+                NSLog(@"SmokeCOAlarm.BatteryAlert response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -61936,34 +62521,34 @@ class SubscribeAttributeDishwasherAlarmSupported : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute DeviceMuted
  */
-class ReadDishwasherAlarmGeneratedCommandList : public ReadAttribute {
+class ReadSmokeCoAlarmDeviceMuted : public ReadAttribute {
 public:
-    ReadDishwasherAlarmGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadSmokeCoAlarmDeviceMuted()
+        : ReadAttribute("device-muted")
     {
     }
 
-    ~ReadDishwasherAlarmGeneratedCommandList()
+    ~ReadSmokeCoAlarmDeviceMuted()
     {
     }
 
     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::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 = [[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 = [[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("DishwasherAlarm GeneratedCommandList read Error", error);
+                LogNSError("SmokeCOAlarm DeviceMuted read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -61972,25 +62557,25 @@ class ReadDishwasherAlarmGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherAlarmGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmDeviceMuted : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeSmokeCoAlarmDeviceMuted()
+        : SubscribeAttribute("device-muted")
     {
     }
 
-    ~SubscribeAttributeDishwasherAlarmGeneratedCommandList()
+    ~SubscribeAttributeSmokeCoAlarmDeviceMuted()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherAlarm 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();
@@ -62001,10 +62586,10 @@ class SubscribeAttributeDishwasherAlarmGeneratedCommandList : public SubscribeAt
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+        [cluster subscribeAttributeDeviceMutedWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.DeviceMuted response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62021,34 +62606,34 @@ class SubscribeAttributeDishwasherAlarmGeneratedCommandList : public SubscribeAt
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute TestInProgress
  */
-class ReadDishwasherAlarmAcceptedCommandList : public ReadAttribute {
+class ReadSmokeCoAlarmTestInProgress : public ReadAttribute {
 public:
-    ReadDishwasherAlarmAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadSmokeCoAlarmTestInProgress()
+        : ReadAttribute("test-in-progress")
     {
     }
 
-    ~ReadDishwasherAlarmAcceptedCommandList()
+    ~ReadSmokeCoAlarmTestInProgress()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherAlarm.AcceptedCommandList 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("DishwasherAlarm AcceptedCommandList read Error", error);
+                LogNSError("SmokeCOAlarm TestInProgress read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62057,25 +62642,25 @@ class ReadDishwasherAlarmAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherAlarmAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmTestInProgress : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeSmokeCoAlarmTestInProgress()
+        : SubscribeAttribute("test-in-progress")
     {
     }
 
-    ~SubscribeAttributeDishwasherAlarmAcceptedCommandList()
+    ~SubscribeAttributeSmokeCoAlarmTestInProgress()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherAlarm 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();
@@ -62086,10 +62671,10 @@ class SubscribeAttributeDishwasherAlarmAcceptedCommandList : public SubscribeAtt
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+        [cluster subscribeAttributeTestInProgressWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.TestInProgress response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62106,34 +62691,34 @@ class SubscribeAttributeDishwasherAlarmAcceptedCommandList : public SubscribeAtt
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute EventList
+ * Attribute HardwareFaultAlert
  */
-class ReadDishwasherAlarmEventList : public ReadAttribute {
+class ReadSmokeCoAlarmHardwareFaultAlert : public ReadAttribute {
 public:
-    ReadDishwasherAlarmEventList()
-        : ReadAttribute("event-list")
+    ReadSmokeCoAlarmHardwareFaultAlert()
+        : ReadAttribute("hardware-fault-alert")
     {
     }
 
-    ~ReadDishwasherAlarmEventList()
+    ~ReadSmokeCoAlarmHardwareFaultAlert()
     {
     }
 
     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::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::HardwareFaultAlert::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%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]);
+        __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("DishwasherAlarm EventList read Error", error);
+                LogNSError("SmokeCOAlarm HardwareFaultAlert read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62142,25 +62727,25 @@ class ReadDishwasherAlarmEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherAlarmEventList : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmHardwareFaultAlert : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmEventList()
-        : SubscribeAttribute("event-list")
+    SubscribeAttributeSmokeCoAlarmHardwareFaultAlert()
+        : SubscribeAttribute("hardware-fault-alert")
     {
     }
 
-    ~SubscribeAttributeDishwasherAlarmEventList()
+    ~SubscribeAttributeSmokeCoAlarmHardwareFaultAlert()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherAlarm 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();
@@ -62171,10 +62756,10 @@ class SubscribeAttributeDishwasherAlarmEventList : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeEventListWithParams:params
+        [cluster subscribeAttributeHardwareFaultAlertWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.EventList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.HardwareFaultAlert response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62191,34 +62776,34 @@ class SubscribeAttributeDishwasherAlarmEventList : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AttributeList
+ * Attribute EndOfServiceAlert
  */
-class ReadDishwasherAlarmAttributeList : public ReadAttribute {
+class ReadSmokeCoAlarmEndOfServiceAlert : public ReadAttribute {
 public:
-    ReadDishwasherAlarmAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadSmokeCoAlarmEndOfServiceAlert()
+        : ReadAttribute("end-of-service-alert")
     {
     }
 
-    ~ReadDishwasherAlarmAttributeList()
+    ~ReadSmokeCoAlarmEndOfServiceAlert()
     {
     }
 
     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::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::EndOfServiceAlert::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%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]);
+        __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("DishwasherAlarm AttributeList read Error", error);
+                LogNSError("SmokeCOAlarm EndOfServiceAlert read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62227,25 +62812,25 @@ class ReadDishwasherAlarmAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherAlarmAttributeList : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmEndOfServiceAlert : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeSmokeCoAlarmEndOfServiceAlert()
+        : SubscribeAttribute("end-of-service-alert")
     {
     }
 
-    ~SubscribeAttributeDishwasherAlarmAttributeList()
+    ~SubscribeAttributeSmokeCoAlarmEndOfServiceAlert()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherAlarm 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();
@@ -62256,10 +62841,10 @@ class SubscribeAttributeDishwasherAlarmAttributeList : public SubscribeAttribute
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAttributeListWithParams:params
+        [cluster subscribeAttributeEndOfServiceAlertWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.AttributeList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.EndOfServiceAlert response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62276,34 +62861,34 @@ class SubscribeAttributeDishwasherAlarmAttributeList : public SubscribeAttribute
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute FeatureMap
+ * Attribute InterconnectSmokeAlarm
  */
-class ReadDishwasherAlarmFeatureMap : public ReadAttribute {
+class ReadSmokeCoAlarmInterconnectSmokeAlarm : public ReadAttribute {
 public:
-    ReadDishwasherAlarmFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadSmokeCoAlarmInterconnectSmokeAlarm()
+        : ReadAttribute("interconnect-smoke-alarm")
     {
     }
 
-    ~ReadDishwasherAlarmFeatureMap()
+    ~ReadSmokeCoAlarmInterconnectSmokeAlarm()
     {
     }
 
     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::SmokeCoAlarm::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::SmokeCoAlarm::Attributes::InterconnectSmokeAlarm::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%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]);
+        __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("DishwasherAlarm FeatureMap read Error", error);
+                LogNSError("SmokeCOAlarm InterconnectSmokeAlarm read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62312,25 +62897,25 @@ class ReadDishwasherAlarmFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherAlarmFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmInterconnectSmokeAlarm : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeSmokeCoAlarmInterconnectSmokeAlarm()
+        : SubscribeAttribute("interconnect-smoke-alarm")
     {
     }
 
-    ~SubscribeAttributeDishwasherAlarmFeatureMap()
+    ~SubscribeAttributeSmokeCoAlarmInterconnectSmokeAlarm()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherAlarm 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();
@@ -62341,10 +62926,10 @@ class SubscribeAttributeDishwasherAlarmFeatureMap : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeFeatureMapWithParams:params
+        [cluster subscribeAttributeInterconnectSmokeAlarmWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.FeatureMap response %@", [value description]);
+                NSLog(@"SmokeCOAlarm.InterconnectSmokeAlarm response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62361,34 +62946,34 @@ class SubscribeAttributeDishwasherAlarmFeatureMap : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ClusterRevision
+ * Attribute InterconnectCOAlarm
  */
-class ReadDishwasherAlarmClusterRevision : public ReadAttribute {
+class ReadSmokeCoAlarmInterconnectCOAlarm : public ReadAttribute {
 public:
-    ReadDishwasherAlarmClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadSmokeCoAlarmInterconnectCOAlarm()
+        : ReadAttribute("interconnect-coalarm")
     {
     }
 
-    ~ReadDishwasherAlarmClusterRevision()
+    ~ReadSmokeCoAlarmInterconnectCOAlarm()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"DishwasherAlarm.ClusterRevision response %@", [value description]);
+        __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("DishwasherAlarm ClusterRevision read Error", error);
+                LogNSError("SmokeCOAlarm InterconnectCOAlarm read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62397,25 +62982,25 @@ class ReadDishwasherAlarmClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeDishwasherAlarmClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmInterconnectCOAlarm : public SubscribeAttribute {
 public:
-    SubscribeAttributeDishwasherAlarmClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeSmokeCoAlarmInterconnectCOAlarm()
+        : SubscribeAttribute("interconnect-coalarm")
     {
     }
 
-    ~SubscribeAttributeDishwasherAlarmClusterRevision()
+    ~SubscribeAttributeSmokeCoAlarmInterconnectCOAlarm()
     {
     }
 
     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::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 = [[MTRBaseClusterDishwasherAlarm 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();
@@ -62426,10 +63011,10 @@ class SubscribeAttributeDishwasherAlarmClusterRevision : public SubscribeAttribu
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeClusterRevisionWithParams:params
+        [cluster subscribeAttributeInterconnectCOAlarmWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"DishwasherAlarm.ClusterRevision response %@", [value description]);
+                NSLog(@"SmokeCOAlarm.InterconnectCOAlarm response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62442,58 +63027,123 @@ class SubscribeAttributeDishwasherAlarmClusterRevision : public SubscribeAttribu
     }
 };
 
-#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:                                                             |        |
-\*----------------------------------------------------------------------------*/
 
+/*
+ * Attribute ContaminationState
+ */
+class ReadSmokeCoAlarmContaminationState : public ReadAttribute {
+public:
+    ReadSmokeCoAlarmContaminationState()
+        : ReadAttribute("contamination-state")
+    {
+    }
+
+    ~ReadSmokeCoAlarmContaminationState()
+    {
+    }
+
+    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;
+
+        ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%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]);
+            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 SupportedModes
+ * Attribute SmokeSensitivityLevel
  */
-class ReadMicrowaveOvenModeSupportedModes : public ReadAttribute {
+class ReadSmokeCoAlarmSmokeSensitivityLevel : public ReadAttribute {
 public:
-    ReadMicrowaveOvenModeSupportedModes()
-        : ReadAttribute("supported-modes")
+    ReadSmokeCoAlarmSmokeSensitivityLevel()
+        : ReadAttribute("smoke-sensitivity-level")
     {
     }
 
-    ~ReadMicrowaveOvenModeSupportedModes()
+    ~ReadSmokeCoAlarmSmokeSensitivityLevel()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MicrowaveOvenMode.SupportedModes response %@", [value description]);
+        __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("MicrowaveOvenMode SupportedModes read Error", error);
+                LogNSError("SmokeCOAlarm SmokeSensitivityLevel read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62502,25 +63152,66 @@ class ReadMicrowaveOvenModeSupportedModes : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMicrowaveOvenModeSupportedModes : public SubscribeAttribute {
+class WriteSmokeCoAlarmSmokeSensitivityLevel : public WriteAttribute {
 public:
-    SubscribeAttributeMicrowaveOvenModeSupportedModes()
-        : SubscribeAttribute("supported-modes")
+    WriteSmokeCoAlarmSmokeSensitivityLevel()
+        : WriteAttribute("smoke-sensitivity-level")
     {
+        AddArgument("attr-name", "smoke-sensitivity-level");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeMicrowaveOvenModeSupportedModes()
+    ~WriteSmokeCoAlarmSmokeSensitivityLevel()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenMode 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();
@@ -62531,10 +63222,10 @@ class SubscribeAttributeMicrowaveOvenModeSupportedModes : public SubscribeAttrib
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeSupportedModesWithParams:params
+        [cluster subscribeAttributeSmokeSensitivityLevelWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MicrowaveOvenMode.SupportedModes response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"SmokeCOAlarm.SmokeSensitivityLevel response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62551,34 +63242,34 @@ class SubscribeAttributeMicrowaveOvenModeSupportedModes : public SubscribeAttrib
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute CurrentMode
+ * Attribute ExpiryDate
  */
-class ReadMicrowaveOvenModeCurrentMode : public ReadAttribute {
+class ReadSmokeCoAlarmExpiryDate : public ReadAttribute {
 public:
-    ReadMicrowaveOvenModeCurrentMode()
-        : ReadAttribute("current-mode")
+    ReadSmokeCoAlarmExpiryDate()
+        : ReadAttribute("expiry-date")
     {
     }
 
-    ~ReadMicrowaveOvenModeCurrentMode()
+    ~ReadSmokeCoAlarmExpiryDate()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MicrowaveOvenMode.CurrentMode response %@", [value description]);
+        __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("MicrowaveOvenMode CurrentMode read Error", error);
+                LogNSError("SmokeCOAlarm ExpiryDate read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62587,25 +63278,25 @@ class ReadMicrowaveOvenModeCurrentMode : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMicrowaveOvenModeCurrentMode : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmExpiryDate : public SubscribeAttribute {
 public:
-    SubscribeAttributeMicrowaveOvenModeCurrentMode()
-        : SubscribeAttribute("current-mode")
+    SubscribeAttributeSmokeCoAlarmExpiryDate()
+        : SubscribeAttribute("expiry-date")
     {
     }
 
-    ~SubscribeAttributeMicrowaveOvenModeCurrentMode()
+    ~SubscribeAttributeSmokeCoAlarmExpiryDate()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenMode 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();
@@ -62616,10 +63307,10 @@ class SubscribeAttributeMicrowaveOvenModeCurrentMode : public SubscribeAttribute
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeCurrentModeWithParams:params
+        [cluster subscribeAttributeExpiryDateWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MicrowaveOvenMode.CurrentMode response %@", [value description]);
+                NSLog(@"SmokeCOAlarm.ExpiryDate response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62638,32 +63329,32 @@ class SubscribeAttributeMicrowaveOvenModeCurrentMode : public SubscribeAttribute
 /*
  * Attribute GeneratedCommandList
  */
-class ReadMicrowaveOvenModeGeneratedCommandList : public ReadAttribute {
+class ReadSmokeCoAlarmGeneratedCommandList : public ReadAttribute {
 public:
-    ReadMicrowaveOvenModeGeneratedCommandList()
+    ReadSmokeCoAlarmGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadMicrowaveOvenModeGeneratedCommandList()
+    ~ReadSmokeCoAlarmGeneratedCommandList()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MicrowaveOvenMode.GeneratedCommandList response %@", [value description]);
+            NSLog(@"SmokeCOAlarm.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("MicrowaveOvenMode GeneratedCommandList read Error", error);
+                LogNSError("SmokeCOAlarm GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62672,25 +63363,25 @@ class ReadMicrowaveOvenModeGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMicrowaveOvenModeGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeMicrowaveOvenModeGeneratedCommandList()
+    SubscribeAttributeSmokeCoAlarmGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeMicrowaveOvenModeGeneratedCommandList()
+    ~SubscribeAttributeSmokeCoAlarmGeneratedCommandList()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenMode 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();
@@ -62704,7 +63395,7 @@ class SubscribeAttributeMicrowaveOvenModeGeneratedCommandList : public Subscribe
         [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MicrowaveOvenMode.GeneratedCommandList response %@", [value description]);
+                NSLog(@"SmokeCOAlarm.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62723,32 +63414,32 @@ class SubscribeAttributeMicrowaveOvenModeGeneratedCommandList : public Subscribe
 /*
  * Attribute AcceptedCommandList
  */
-class ReadMicrowaveOvenModeAcceptedCommandList : public ReadAttribute {
+class ReadSmokeCoAlarmAcceptedCommandList : public ReadAttribute {
 public:
-    ReadMicrowaveOvenModeAcceptedCommandList()
+    ReadSmokeCoAlarmAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadMicrowaveOvenModeAcceptedCommandList()
+    ~ReadSmokeCoAlarmAcceptedCommandList()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MicrowaveOvenMode.AcceptedCommandList response %@", [value description]);
+            NSLog(@"SmokeCOAlarm.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("MicrowaveOvenMode AcceptedCommandList read Error", error);
+                LogNSError("SmokeCOAlarm AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62757,25 +63448,25 @@ class ReadMicrowaveOvenModeAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMicrowaveOvenModeAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeMicrowaveOvenModeAcceptedCommandList()
+    SubscribeAttributeSmokeCoAlarmAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeMicrowaveOvenModeAcceptedCommandList()
+    ~SubscribeAttributeSmokeCoAlarmAcceptedCommandList()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenMode 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();
@@ -62789,7 +63480,7 @@ class SubscribeAttributeMicrowaveOvenModeAcceptedCommandList : public SubscribeA
         [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MicrowaveOvenMode.AcceptedCommandList response %@", [value description]);
+                NSLog(@"SmokeCOAlarm.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62808,32 +63499,32 @@ class SubscribeAttributeMicrowaveOvenModeAcceptedCommandList : public SubscribeA
 /*
  * Attribute EventList
  */
-class ReadMicrowaveOvenModeEventList : public ReadAttribute {
+class ReadSmokeCoAlarmEventList : public ReadAttribute {
 public:
-    ReadMicrowaveOvenModeEventList()
+    ReadSmokeCoAlarmEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadMicrowaveOvenModeEventList()
+    ~ReadSmokeCoAlarmEventList()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MicrowaveOvenMode.EventList response %@", [value description]);
+            NSLog(@"SmokeCOAlarm.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("MicrowaveOvenMode EventList read Error", error);
+                LogNSError("SmokeCOAlarm EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62842,25 +63533,25 @@ class ReadMicrowaveOvenModeEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMicrowaveOvenModeEventList : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeMicrowaveOvenModeEventList()
+    SubscribeAttributeSmokeCoAlarmEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeMicrowaveOvenModeEventList()
+    ~SubscribeAttributeSmokeCoAlarmEventList()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenMode 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();
@@ -62874,7 +63565,7 @@ class SubscribeAttributeMicrowaveOvenModeEventList : public SubscribeAttribute {
         [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MicrowaveOvenMode.EventList response %@", [value description]);
+                NSLog(@"SmokeCOAlarm.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62893,32 +63584,32 @@ class SubscribeAttributeMicrowaveOvenModeEventList : public SubscribeAttribute {
 /*
  * Attribute AttributeList
  */
-class ReadMicrowaveOvenModeAttributeList : public ReadAttribute {
+class ReadSmokeCoAlarmAttributeList : public ReadAttribute {
 public:
-    ReadMicrowaveOvenModeAttributeList()
+    ReadSmokeCoAlarmAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadMicrowaveOvenModeAttributeList()
+    ~ReadSmokeCoAlarmAttributeList()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MicrowaveOvenMode.AttributeList response %@", [value description]);
+            NSLog(@"SmokeCOAlarm.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("MicrowaveOvenMode AttributeList read Error", error);
+                LogNSError("SmokeCOAlarm AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -62927,25 +63618,25 @@ class ReadMicrowaveOvenModeAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMicrowaveOvenModeAttributeList : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeMicrowaveOvenModeAttributeList()
+    SubscribeAttributeSmokeCoAlarmAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeMicrowaveOvenModeAttributeList()
+    ~SubscribeAttributeSmokeCoAlarmAttributeList()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenMode 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();
@@ -62959,7 +63650,7 @@ class SubscribeAttributeMicrowaveOvenModeAttributeList : public SubscribeAttribu
         [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MicrowaveOvenMode.AttributeList response %@", [value description]);
+                NSLog(@"SmokeCOAlarm.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -62978,32 +63669,32 @@ class SubscribeAttributeMicrowaveOvenModeAttributeList : public SubscribeAttribu
 /*
  * Attribute FeatureMap
  */
-class ReadMicrowaveOvenModeFeatureMap : public ReadAttribute {
+class ReadSmokeCoAlarmFeatureMap : public ReadAttribute {
 public:
-    ReadMicrowaveOvenModeFeatureMap()
+    ReadSmokeCoAlarmFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadMicrowaveOvenModeFeatureMap()
+    ~ReadSmokeCoAlarmFeatureMap()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MicrowaveOvenMode.FeatureMap response %@", [value description]);
+            NSLog(@"SmokeCOAlarm.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("MicrowaveOvenMode FeatureMap read Error", error);
+                LogNSError("SmokeCOAlarm FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -63012,25 +63703,25 @@ class ReadMicrowaveOvenModeFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMicrowaveOvenModeFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeMicrowaveOvenModeFeatureMap()
+    SubscribeAttributeSmokeCoAlarmFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeMicrowaveOvenModeFeatureMap()
+    ~SubscribeAttributeSmokeCoAlarmFeatureMap()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenMode 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();
@@ -63044,7 +63735,7 @@ class SubscribeAttributeMicrowaveOvenModeFeatureMap : public SubscribeAttribute
         [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MicrowaveOvenMode.FeatureMap response %@", [value description]);
+                NSLog(@"SmokeCOAlarm.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -63063,32 +63754,32 @@ class SubscribeAttributeMicrowaveOvenModeFeatureMap : public SubscribeAttribute
 /*
  * Attribute ClusterRevision
  */
-class ReadMicrowaveOvenModeClusterRevision : public ReadAttribute {
+class ReadSmokeCoAlarmClusterRevision : public ReadAttribute {
 public:
-    ReadMicrowaveOvenModeClusterRevision()
+    ReadSmokeCoAlarmClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadMicrowaveOvenModeClusterRevision()
+    ~ReadSmokeCoAlarmClusterRevision()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenMode alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterSmokeCOAlarm alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MicrowaveOvenMode.ClusterRevision response %@", [value description]);
+            NSLog(@"SmokeCOAlarm.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("MicrowaveOvenMode ClusterRevision read Error", error);
+                LogNSError("SmokeCOAlarm ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -63097,25 +63788,25 @@ class ReadMicrowaveOvenModeClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMicrowaveOvenModeClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeSmokeCoAlarmClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeMicrowaveOvenModeClusterRevision()
+    SubscribeAttributeSmokeCoAlarmClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeMicrowaveOvenModeClusterRevision()
+    ~SubscribeAttributeSmokeCoAlarmClusterRevision()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenMode 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();
@@ -63129,7 +63820,7 @@ class SubscribeAttributeMicrowaveOvenModeClusterRevision : public SubscribeAttri
         [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MicrowaveOvenMode.ClusterRevision response %@", [value description]);
+                NSLog(@"SmokeCOAlarm.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -63146,18 +63837,17 @@ class SubscribeAttributeMicrowaveOvenModeClusterRevision : public SubscribeAttri
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster MicrowaveOvenControl                                        | 0x005F |
+| Cluster DishwasherAlarm                                             | 0x005D |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * SetCookingParameters                                              |   0x00 |
-| * AddMoreTime                                                       |   0x01 |
+| * Reset                                                             |   0x00 |
+| * ModifyEnabledAlarms                                               |   0x01 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * CookTime                                                          | 0x0001 |
-| * PowerSetting                                                      | 0x0002 |
-| * MinPower                                                          | 0x0003 |
-| * MaxPower                                                          | 0x0004 |
-| * PowerStep                                                         | 0x0005 |
+| * Mask                                                              | 0x0000 |
+| * Latch                                                             | 0x0001 |
+| * State                                                             | 0x0002 |
+| * Supported                                                         | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -63166,119 +63856,112 @@ class SubscribeAttributeMicrowaveOvenModeClusterRevision : public SubscribeAttri
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
+| * Notify                                                            | 0x0000 |
 \*----------------------------------------------------------------------------*/
 
 #if MTR_ENABLE_PROVISIONAL
 /*
- * Command SetCookingParameters
+ * Command Reset
  */
-class MicrowaveOvenControlSetCookingParameters : public ClusterCommand {
+class DishwasherAlarmReset : public ClusterCommand {
 public:
-    MicrowaveOvenControlSetCookingParameters()
-        : ClusterCommand("set-cooking-parameters")
+    DishwasherAlarmReset()
+        : ClusterCommand("reset")
     {
-        AddArgument("CookMode", 0, UINT8_MAX, &mRequest.cookMode);
-        AddArgument("CookTime", 0, UINT32_MAX, &mRequest.cookTime);
-        AddArgument("PowerSetting", 0, UINT8_MAX, &mRequest.powerSetting);
+#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::MicrowaveOvenControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MicrowaveOvenControl::Commands::SetCookingParameters::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, 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];
+        __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 (mRequest.cookMode.HasValue()) {
-            params.cookMode = [NSNumber numberWithUnsignedChar:mRequest.cookMode.Value()];
-        } else {
-            params.cookMode = nil;
-        }
-        if (mRequest.cookTime.HasValue()) {
-            params.cookTime = [NSNumber numberWithUnsignedInt:mRequest.cookTime.Value()];
-        } else {
-            params.cookTime = nil;
-        }
-        if (mRequest.powerSetting.HasValue()) {
-            params.powerSetting = [NSNumber numberWithUnsignedChar:mRequest.powerSetting.Value()];
-        } else {
-            params.powerSetting = 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 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);
-                                                                   }
-                                                               }];
+            [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::MicrowaveOvenControl::Commands::SetCookingParameters::Type mRequest;
+    chip::app::Clusters::DishwasherAlarm::Commands::Reset::Type mRequest;
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*
- * Command AddMoreTime
+ * Command ModifyEnabledAlarms
  */
-class MicrowaveOvenControlAddMoreTime : public ClusterCommand {
+class DishwasherAlarmModifyEnabledAlarms : public ClusterCommand {
 public:
-    MicrowaveOvenControlAddMoreTime()
-        : ClusterCommand("add-more-time")
+    DishwasherAlarmModifyEnabledAlarms()
+        : ClusterCommand("modify-enabled-alarms")
     {
-        AddArgument("TimeToAdd", 0, UINT32_MAX, &mRequest.timeToAdd);
+#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::MicrowaveOvenControl::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::MicrowaveOvenControl::Commands::AddMoreTime::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, 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];
+        __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;
-        params.timeToAdd = [NSNumber numberWithUnsignedInt:mRequest.timeToAdd];
+#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 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);
-                                                          }
-                                                      }];
+            [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::MicrowaveOvenControl::Commands::AddMoreTime::Type mRequest;
+    chip::app::Clusters::DishwasherAlarm::Commands::ModifyEnabledAlarms::Type mRequest;
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
@@ -63286,34 +63969,34 @@ class MicrowaveOvenControlAddMoreTime : public ClusterCommand {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute CookTime
+ * Attribute Mask
  */
-class ReadMicrowaveOvenControlCookTime : public ReadAttribute {
+class ReadDishwasherAlarmMask : public ReadAttribute {
 public:
-    ReadMicrowaveOvenControlCookTime()
-        : ReadAttribute("cook-time")
+    ReadDishwasherAlarmMask()
+        : ReadAttribute("mask")
     {
     }
 
-    ~ReadMicrowaveOvenControlCookTime()
+    ~ReadDishwasherAlarmMask()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeCookTimeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MicrowaveOvenControl.CookTime response %@", [value description]);
+        __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("MicrowaveOvenControl CookTime read Error", error);
+                LogNSError("DishwasherAlarm Mask read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -63322,25 +64005,25 @@ class ReadMicrowaveOvenControlCookTime : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMicrowaveOvenControlCookTime : public SubscribeAttribute {
+class SubscribeAttributeDishwasherAlarmMask : public SubscribeAttribute {
 public:
-    SubscribeAttributeMicrowaveOvenControlCookTime()
-        : SubscribeAttribute("cook-time")
+    SubscribeAttributeDishwasherAlarmMask()
+        : SubscribeAttribute("mask")
     {
     }
 
-    ~SubscribeAttributeMicrowaveOvenControlCookTime()
+    ~SubscribeAttributeDishwasherAlarmMask()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -63351,10 +64034,10 @@ class SubscribeAttributeMicrowaveOvenControlCookTime : public SubscribeAttribute
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeCookTimeWithParams:params
+        [cluster subscribeAttributeMaskWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MicrowaveOvenControl.CookTime response %@", [value description]);
+                NSLog(@"DishwasherAlarm.Mask response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -63371,34 +64054,34 @@ class SubscribeAttributeMicrowaveOvenControlCookTime : public SubscribeAttribute
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute PowerSetting
+ * Attribute Latch
  */
-class ReadMicrowaveOvenControlPowerSetting : public ReadAttribute {
+class ReadDishwasherAlarmLatch : public ReadAttribute {
 public:
-    ReadMicrowaveOvenControlPowerSetting()
-        : ReadAttribute("power-setting")
+    ReadDishwasherAlarmLatch()
+        : ReadAttribute("latch")
     {
     }
 
-    ~ReadMicrowaveOvenControlPowerSetting()
+    ~ReadDishwasherAlarmLatch()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributePowerSettingWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MicrowaveOvenControl.PowerSetting response %@", [value description]);
+        __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("MicrowaveOvenControl PowerSetting read Error", error);
+                LogNSError("DishwasherAlarm Latch read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -63407,25 +64090,25 @@ class ReadMicrowaveOvenControlPowerSetting : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMicrowaveOvenControlPowerSetting : public SubscribeAttribute {
+class SubscribeAttributeDishwasherAlarmLatch : public SubscribeAttribute {
 public:
-    SubscribeAttributeMicrowaveOvenControlPowerSetting()
-        : SubscribeAttribute("power-setting")
+    SubscribeAttributeDishwasherAlarmLatch()
+        : SubscribeAttribute("latch")
     {
     }
 
-    ~SubscribeAttributeMicrowaveOvenControlPowerSetting()
+    ~SubscribeAttributeDishwasherAlarmLatch()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -63436,10 +64119,10 @@ class SubscribeAttributeMicrowaveOvenControlPowerSetting : public SubscribeAttri
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributePowerSettingWithParams:params
+        [cluster subscribeAttributeLatchWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MicrowaveOvenControl.PowerSetting response %@", [value description]);
+                NSLog(@"DishwasherAlarm.Latch response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -63456,34 +64139,34 @@ class SubscribeAttributeMicrowaveOvenControlPowerSetting : public SubscribeAttri
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute MinPower
+ * Attribute State
  */
-class ReadMicrowaveOvenControlMinPower : public ReadAttribute {
+class ReadDishwasherAlarmState : public ReadAttribute {
 public:
-    ReadMicrowaveOvenControlMinPower()
-        : ReadAttribute("min-power")
+    ReadDishwasherAlarmState()
+        : ReadAttribute("state")
     {
     }
 
-    ~ReadMicrowaveOvenControlMinPower()
+    ~ReadDishwasherAlarmState()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeMinPowerWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MicrowaveOvenControl.MinPower response %@", [value description]);
+        __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("MicrowaveOvenControl MinPower read Error", error);
+                LogNSError("DishwasherAlarm State read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -63492,25 +64175,25 @@ class ReadMicrowaveOvenControlMinPower : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMicrowaveOvenControlMinPower : public SubscribeAttribute {
+class SubscribeAttributeDishwasherAlarmState : public SubscribeAttribute {
 public:
-    SubscribeAttributeMicrowaveOvenControlMinPower()
-        : SubscribeAttribute("min-power")
+    SubscribeAttributeDishwasherAlarmState()
+        : SubscribeAttribute("state")
     {
     }
 
-    ~SubscribeAttributeMicrowaveOvenControlMinPower()
+    ~SubscribeAttributeDishwasherAlarmState()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -63521,10 +64204,10 @@ class SubscribeAttributeMicrowaveOvenControlMinPower : public SubscribeAttribute
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeMinPowerWithParams:params
+        [cluster subscribeAttributeStateWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MicrowaveOvenControl.MinPower response %@", [value description]);
+                NSLog(@"DishwasherAlarm.State response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -63541,34 +64224,34 @@ class SubscribeAttributeMicrowaveOvenControlMinPower : public SubscribeAttribute
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute MaxPower
+ * Attribute Supported
  */
-class ReadMicrowaveOvenControlMaxPower : public ReadAttribute {
+class ReadDishwasherAlarmSupported : public ReadAttribute {
 public:
-    ReadMicrowaveOvenControlMaxPower()
-        : ReadAttribute("max-power")
+    ReadDishwasherAlarmSupported()
+        : ReadAttribute("supported")
     {
     }
 
-    ~ReadMicrowaveOvenControlMaxPower()
+    ~ReadDishwasherAlarmSupported()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeMaxPowerWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MicrowaveOvenControl.MaxPower response %@", [value description]);
+        __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("MicrowaveOvenControl MaxPower read Error", error);
+                LogNSError("DishwasherAlarm Supported read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -63577,25 +64260,5086 @@ class ReadMicrowaveOvenControlMaxPower : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMicrowaveOvenControlMaxPower : public SubscribeAttribute {
+class SubscribeAttributeDishwasherAlarmSupported : public SubscribeAttribute {
 public:
-    SubscribeAttributeMicrowaveOvenControlMaxPower()
-        : SubscribeAttribute("max-power")
+    SubscribeAttributeDishwasherAlarmSupported()
+        : SubscribeAttribute("supported")
     {
     }
 
-    ~SubscribeAttributeMicrowaveOvenControlMaxPower()
+    ~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::MicrowaveOvenControl::Id;
-        constexpr chip::CommandId attributeId = chip::app::Clusters::MicrowaveOvenControl::Attributes::MaxPower::Id;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -63606,10 +69350,10 @@ class SubscribeAttributeMicrowaveOvenControlMaxPower : public SubscribeAttribute
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeMaxPowerWithParams:params
+        [cluster subscribeAttributeDegradationDirectionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MicrowaveOvenControl.MaxPower response %@", [value description]);
+                NSLog(@"HEPAFilterMonitoring.DegradationDirection response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -63626,34 +69370,34 @@ class SubscribeAttributeMicrowaveOvenControlMaxPower : public SubscribeAttribute
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute PowerStep
+ * Attribute ChangeIndication
  */
-class ReadMicrowaveOvenControlPowerStep : public ReadAttribute {
+class ReadHepaFilterMonitoringChangeIndication : public ReadAttribute {
 public:
-    ReadMicrowaveOvenControlPowerStep()
-        : ReadAttribute("power-step")
+    ReadHepaFilterMonitoringChangeIndication()
+        : ReadAttribute("change-indication")
     {
     }
 
-    ~ReadMicrowaveOvenControlPowerStep()
+    ~ReadHepaFilterMonitoringChangeIndication()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributePowerStepWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MicrowaveOvenControl.PowerStep response %@", [value description]);
+        __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("MicrowaveOvenControl PowerStep read Error", error);
+                LogNSError("HEPAFilterMonitoring ChangeIndication read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -63662,25 +69406,25 @@ class ReadMicrowaveOvenControlPowerStep : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMicrowaveOvenControlPowerStep : public SubscribeAttribute {
+class SubscribeAttributeHepaFilterMonitoringChangeIndication : public SubscribeAttribute {
 public:
-    SubscribeAttributeMicrowaveOvenControlPowerStep()
-        : SubscribeAttribute("power-step")
+    SubscribeAttributeHepaFilterMonitoringChangeIndication()
+        : SubscribeAttribute("change-indication")
     {
     }
 
-    ~SubscribeAttributeMicrowaveOvenControlPowerStep()
+    ~SubscribeAttributeHepaFilterMonitoringChangeIndication()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -63691,10 +69435,10 @@ class SubscribeAttributeMicrowaveOvenControlPowerStep : public SubscribeAttribut
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributePowerStepWithParams:params
+        [cluster subscribeAttributeChangeIndicationWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MicrowaveOvenControl.PowerStep response %@", [value description]);
+                NSLog(@"HEPAFilterMonitoring.ChangeIndication response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -63711,34 +69455,34 @@ class SubscribeAttributeMicrowaveOvenControlPowerStep : public SubscribeAttribut
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute InPlaceIndicator
  */
-class ReadMicrowaveOvenControlGeneratedCommandList : public ReadAttribute {
+class ReadHepaFilterMonitoringInPlaceIndicator : public ReadAttribute {
 public:
-    ReadMicrowaveOvenControlGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadHepaFilterMonitoringInPlaceIndicator()
+        : ReadAttribute("in-place-indicator")
     {
     }
 
-    ~ReadMicrowaveOvenControlGeneratedCommandList()
+    ~ReadHepaFilterMonitoringInPlaceIndicator()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MicrowaveOvenControl.GeneratedCommandList response %@", [value description]);
+        __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("MicrowaveOvenControl GeneratedCommandList read Error", error);
+                LogNSError("HEPAFilterMonitoring InPlaceIndicator read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -63747,25 +69491,25 @@ class ReadMicrowaveOvenControlGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMicrowaveOvenControlGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeHepaFilterMonitoringInPlaceIndicator : public SubscribeAttribute {
 public:
-    SubscribeAttributeMicrowaveOvenControlGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeHepaFilterMonitoringInPlaceIndicator()
+        : SubscribeAttribute("in-place-indicator")
     {
     }
 
-    ~SubscribeAttributeMicrowaveOvenControlGeneratedCommandList()
+    ~SubscribeAttributeHepaFilterMonitoringInPlaceIndicator()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -63776,10 +69520,10 @@ class SubscribeAttributeMicrowaveOvenControlGeneratedCommandList : public Subscr
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+        [cluster subscribeAttributeInPlaceIndicatorWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MicrowaveOvenControl.GeneratedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"HEPAFilterMonitoring.InPlaceIndicator response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -63796,34 +69540,34 @@ class SubscribeAttributeMicrowaveOvenControlGeneratedCommandList : public Subscr
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute LastChangedTime
  */
-class ReadMicrowaveOvenControlAcceptedCommandList : public ReadAttribute {
+class ReadHepaFilterMonitoringLastChangedTime : public ReadAttribute {
 public:
-    ReadMicrowaveOvenControlAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadHepaFilterMonitoringLastChangedTime()
+        : ReadAttribute("last-changed-time")
     {
     }
 
-    ~ReadMicrowaveOvenControlAcceptedCommandList()
+    ~ReadHepaFilterMonitoringLastChangedTime()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MicrowaveOvenControl.AcceptedCommandList response %@", [value description]);
+        __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("MicrowaveOvenControl AcceptedCommandList read Error", error);
+                LogNSError("HEPAFilterMonitoring LastChangedTime read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -63832,25 +69576,69 @@ class ReadMicrowaveOvenControlAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMicrowaveOvenControlAcceptedCommandList : public SubscribeAttribute {
+class WriteHepaFilterMonitoringLastChangedTime : public WriteAttribute {
 public:
-    SubscribeAttributeMicrowaveOvenControlAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    WriteHepaFilterMonitoringLastChangedTime()
+        : WriteAttribute("last-changed-time")
     {
+        AddArgument("attr-name", "last-changed-time");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeMicrowaveOvenControlAcceptedCommandList()
+    ~WriteHepaFilterMonitoringLastChangedTime()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -63861,10 +69649,10 @@ class SubscribeAttributeMicrowaveOvenControlAcceptedCommandList : public Subscri
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+        [cluster subscribeAttributeLastChangedTimeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MicrowaveOvenControl.AcceptedCommandList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"HEPAFilterMonitoring.LastChangedTime response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -63881,34 +69669,34 @@ class SubscribeAttributeMicrowaveOvenControlAcceptedCommandList : public Subscri
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute EventList
+ * Attribute ReplacementProductList
  */
-class ReadMicrowaveOvenControlEventList : public ReadAttribute {
+class ReadHepaFilterMonitoringReplacementProductList : public ReadAttribute {
 public:
-    ReadMicrowaveOvenControlEventList()
-        : ReadAttribute("event-list")
+    ReadHepaFilterMonitoringReplacementProductList()
+        : ReadAttribute("replacement-product-list")
     {
     }
 
-    ~ReadMicrowaveOvenControlEventList()
+    ~ReadHepaFilterMonitoringReplacementProductList()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MicrowaveOvenControl.EventList response %@", [value description]);
+        __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("MicrowaveOvenControl EventList read Error", error);
+                LogNSError("HEPAFilterMonitoring ReplacementProductList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -63917,25 +69705,25 @@ class ReadMicrowaveOvenControlEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMicrowaveOvenControlEventList : public SubscribeAttribute {
+class SubscribeAttributeHepaFilterMonitoringReplacementProductList : public SubscribeAttribute {
 public:
-    SubscribeAttributeMicrowaveOvenControlEventList()
-        : SubscribeAttribute("event-list")
+    SubscribeAttributeHepaFilterMonitoringReplacementProductList()
+        : SubscribeAttribute("replacement-product-list")
     {
     }
 
-    ~SubscribeAttributeMicrowaveOvenControlEventList()
+    ~SubscribeAttributeHepaFilterMonitoringReplacementProductList()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -63946,10 +69734,10 @@ class SubscribeAttributeMicrowaveOvenControlEventList : public SubscribeAttribut
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeEventListWithParams:params
+        [cluster subscribeAttributeReplacementProductListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MicrowaveOvenControl.EventList response %@", [value description]);
+                NSLog(@"HEPAFilterMonitoring.ReplacementProductList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -63966,34 +69754,34 @@ class SubscribeAttributeMicrowaveOvenControlEventList : public SubscribeAttribut
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AttributeList
+ * Attribute GeneratedCommandList
  */
-class ReadMicrowaveOvenControlAttributeList : public ReadAttribute {
+class ReadHepaFilterMonitoringGeneratedCommandList : public ReadAttribute {
 public:
-    ReadMicrowaveOvenControlAttributeList()
-        : ReadAttribute("attribute-list")
+    ReadHepaFilterMonitoringGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadMicrowaveOvenControlAttributeList()
+    ~ReadHepaFilterMonitoringGeneratedCommandList()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MicrowaveOvenControl.AttributeList response %@", [value description]);
+        __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("MicrowaveOvenControl AttributeList read Error", error);
+                LogNSError("HEPAFilterMonitoring GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64002,25 +69790,25 @@ class ReadMicrowaveOvenControlAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMicrowaveOvenControlAttributeList : public SubscribeAttribute {
+class SubscribeAttributeHepaFilterMonitoringGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeMicrowaveOvenControlAttributeList()
-        : SubscribeAttribute("attribute-list")
+    SubscribeAttributeHepaFilterMonitoringGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeMicrowaveOvenControlAttributeList()
+    ~SubscribeAttributeHepaFilterMonitoringGeneratedCommandList()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -64031,10 +69819,10 @@ class SubscribeAttributeMicrowaveOvenControlAttributeList : public SubscribeAttr
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAttributeListWithParams:params
+        [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MicrowaveOvenControl.AttributeList response %@", [value description]);
+                NSLog(@"HEPAFilterMonitoring.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64051,34 +69839,34 @@ class SubscribeAttributeMicrowaveOvenControlAttributeList : public SubscribeAttr
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute FeatureMap
+ * Attribute AcceptedCommandList
  */
-class ReadMicrowaveOvenControlFeatureMap : public ReadAttribute {
+class ReadHepaFilterMonitoringAcceptedCommandList : public ReadAttribute {
 public:
-    ReadMicrowaveOvenControlFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadHepaFilterMonitoringAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadMicrowaveOvenControlFeatureMap()
+    ~ReadHepaFilterMonitoringAcceptedCommandList()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MicrowaveOvenControl.FeatureMap response %@", [value description]);
+        __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("MicrowaveOvenControl FeatureMap read Error", error);
+                LogNSError("HEPAFilterMonitoring AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64087,25 +69875,25 @@ class ReadMicrowaveOvenControlFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMicrowaveOvenControlFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeHepaFilterMonitoringAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeMicrowaveOvenControlFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeHepaFilterMonitoringAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeMicrowaveOvenControlFeatureMap()
+    ~SubscribeAttributeHepaFilterMonitoringAcceptedCommandList()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -64116,10 +69904,10 @@ class SubscribeAttributeMicrowaveOvenControlFeatureMap : public SubscribeAttribu
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeFeatureMapWithParams:params
+        [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MicrowaveOvenControl.FeatureMap response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"HEPAFilterMonitoring.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64136,34 +69924,34 @@ class SubscribeAttributeMicrowaveOvenControlFeatureMap : public SubscribeAttribu
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ClusterRevision
+ * Attribute EventList
  */
-class ReadMicrowaveOvenControlClusterRevision : public ReadAttribute {
+class ReadHepaFilterMonitoringEventList : public ReadAttribute {
 public:
-    ReadMicrowaveOvenControlClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadHepaFilterMonitoringEventList()
+        : ReadAttribute("event-list")
     {
     }
 
-    ~ReadMicrowaveOvenControlClusterRevision()
+    ~ReadHepaFilterMonitoringEventList()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"MicrowaveOvenControl.ClusterRevision response %@", [value description]);
+        __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("MicrowaveOvenControl ClusterRevision read Error", error);
+                LogNSError("HEPAFilterMonitoring EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64172,25 +69960,25 @@ class ReadMicrowaveOvenControlClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeMicrowaveOvenControlClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeHepaFilterMonitoringEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeMicrowaveOvenControlClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeHepaFilterMonitoringEventList()
+        : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeMicrowaveOvenControlClusterRevision()
+    ~SubscribeAttributeHepaFilterMonitoringEventList()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterMicrowaveOvenControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -64201,10 +69989,10 @@ class SubscribeAttributeMicrowaveOvenControlClusterRevision : public SubscribeAt
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeClusterRevisionWithParams:params
+        [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"MicrowaveOvenControl.ClusterRevision response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"HEPAFilterMonitoring.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64217,237 +70005,325 @@ class SubscribeAttributeMicrowaveOvenControlClusterRevision : public SubscribeAt
     }
 };
 
-#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
+ * Attribute AttributeList
  */
-class OperationalStatePause : public ClusterCommand {
+class ReadHepaFilterMonitoringAttributeList : public ReadAttribute {
 public:
-    OperationalStatePause()
-        : ClusterCommand("pause")
+    ReadHepaFilterMonitoringAttributeList()
+        : ReadAttribute("attribute-list")
+    {
+    }
+
+    ~ReadHepaFilterMonitoringAttributeList()
     {
-        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;
+        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 ") 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 = [[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);
-                                                    }
-                                                }];
-        }
+        __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;
     }
+};
 
-private:
+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
+
 /*
- * Command Stop
+ * Attribute FeatureMap
  */
-class OperationalStateStop : public ClusterCommand {
+class ReadHepaFilterMonitoringFeatureMap : public ReadAttribute {
 public:
-    OperationalStateStop()
-        : ClusterCommand("stop")
+    ReadHepaFilterMonitoringFeatureMap()
+        : ReadAttribute("feature-map")
+    {
+    }
+
+    ~ReadHepaFilterMonitoringFeatureMap()
     {
-        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::HepaFilterMonitoring::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::HepaFilterMonitoring::Attributes::FeatureMap::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 = [[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;
     }
+};
 
-private:
+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
+
 /*
- * Command Start
+ * Attribute ClusterRevision
  */
-class OperationalStateStart : public ClusterCommand {
+class ReadHepaFilterMonitoringClusterRevision : public ReadAttribute {
 public:
-    OperationalStateStart()
-        : ClusterCommand("start")
+    ReadHepaFilterMonitoringClusterRevision()
+        : ReadAttribute("cluster-revision")
+    {
+    }
+
+    ~ReadHepaFilterMonitoringClusterRevision()
     {
-        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;
+        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 ") 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 = [[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);
-                                                    }
-                                                }];
-        }
+        __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;
     }
+};
 
-private:
+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 Resume
+ * Command ResetCondition
  */
-class OperationalStateResume : public ClusterCommand {
+class ActivatedCarbonFilterMonitoringResetCondition : public ClusterCommand {
 public:
-    OperationalStateResume()
-        : ClusterCommand("resume")
+    ActivatedCarbonFilterMonitoringResetCondition()
+        : ClusterCommand("reset-condition")
     {
         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;
+        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 = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        __auto_type * params = [[MTROperationalStateClusterResumeParams alloc] init];
+        __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 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);
-                                                     }
-                                                 }];
+            [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;
     }
@@ -64460,34 +70336,34 @@ class OperationalStateResume : public ClusterCommand {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute PhaseList
+ * Attribute Condition
  */
-class ReadOperationalStatePhaseList : public ReadAttribute {
+class ReadActivatedCarbonFilterMonitoringCondition : public ReadAttribute {
 public:
-    ReadOperationalStatePhaseList()
-        : ReadAttribute("phase-list")
+    ReadActivatedCarbonFilterMonitoringCondition()
+        : ReadAttribute("condition")
     {
     }
 
-    ~ReadOperationalStatePhaseList()
+    ~ReadActivatedCarbonFilterMonitoringCondition()
     {
     }
 
     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::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 = [[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 = [[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("OperationalState PhaseList read Error", error);
+                LogNSError("ActivatedCarbonFilterMonitoring Condition read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64496,25 +70372,25 @@ class ReadOperationalStatePhaseList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStatePhaseList : public SubscribeAttribute {
+class SubscribeAttributeActivatedCarbonFilterMonitoringCondition : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStatePhaseList()
-        : SubscribeAttribute("phase-list")
+    SubscribeAttributeActivatedCarbonFilterMonitoringCondition()
+        : SubscribeAttribute("condition")
     {
     }
 
-    ~SubscribeAttributeOperationalStatePhaseList()
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringCondition()
     {
     }
 
     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::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 = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -64525,10 +70401,10 @@ class SubscribeAttributeOperationalStatePhaseList : public SubscribeAttribute {
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributePhaseListWithParams:params
+        [cluster subscribeAttributeConditionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.PhaseList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ActivatedCarbonFilterMonitoring.Condition response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64545,34 +70421,34 @@ class SubscribeAttributeOperationalStatePhaseList : public SubscribeAttribute {
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute CurrentPhase
+ * Attribute DegradationDirection
  */
-class ReadOperationalStateCurrentPhase : public ReadAttribute {
+class ReadActivatedCarbonFilterMonitoringDegradationDirection : public ReadAttribute {
 public:
-    ReadOperationalStateCurrentPhase()
-        : ReadAttribute("current-phase")
+    ReadActivatedCarbonFilterMonitoringDegradationDirection()
+        : ReadAttribute("degradation-direction")
     {
     }
 
-    ~ReadOperationalStateCurrentPhase()
+    ~ReadActivatedCarbonFilterMonitoringDegradationDirection()
     {
     }
 
     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::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 = [[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 = [[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("OperationalState CurrentPhase read Error", error);
+                LogNSError("ActivatedCarbonFilterMonitoring DegradationDirection read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64581,25 +70457,25 @@ class ReadOperationalStateCurrentPhase : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateCurrentPhase : public SubscribeAttribute {
+class SubscribeAttributeActivatedCarbonFilterMonitoringDegradationDirection : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateCurrentPhase()
-        : SubscribeAttribute("current-phase")
+    SubscribeAttributeActivatedCarbonFilterMonitoringDegradationDirection()
+        : SubscribeAttribute("degradation-direction")
     {
     }
 
-    ~SubscribeAttributeOperationalStateCurrentPhase()
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringDegradationDirection()
     {
     }
 
     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::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 = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -64610,10 +70486,10 @@ class SubscribeAttributeOperationalStateCurrentPhase : public SubscribeAttribute
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeCurrentPhaseWithParams:params
+        [cluster subscribeAttributeDegradationDirectionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.CurrentPhase response %@", [value description]);
+                NSLog(@"ActivatedCarbonFilterMonitoring.DegradationDirection response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64630,34 +70506,34 @@ class SubscribeAttributeOperationalStateCurrentPhase : public SubscribeAttribute
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute CountdownTime
+ * Attribute ChangeIndication
  */
-class ReadOperationalStateCountdownTime : public ReadAttribute {
+class ReadActivatedCarbonFilterMonitoringChangeIndication : public ReadAttribute {
 public:
-    ReadOperationalStateCountdownTime()
-        : ReadAttribute("countdown-time")
+    ReadActivatedCarbonFilterMonitoringChangeIndication()
+        : ReadAttribute("change-indication")
     {
     }
 
-    ~ReadOperationalStateCountdownTime()
+    ~ReadActivatedCarbonFilterMonitoringChangeIndication()
     {
     }
 
     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::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 = [[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 = [[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("OperationalState CountdownTime read Error", error);
+                LogNSError("ActivatedCarbonFilterMonitoring ChangeIndication read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64666,25 +70542,25 @@ class ReadOperationalStateCountdownTime : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateCountdownTime : public SubscribeAttribute {
+class SubscribeAttributeActivatedCarbonFilterMonitoringChangeIndication : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateCountdownTime()
-        : SubscribeAttribute("countdown-time")
+    SubscribeAttributeActivatedCarbonFilterMonitoringChangeIndication()
+        : SubscribeAttribute("change-indication")
     {
     }
 
-    ~SubscribeAttributeOperationalStateCountdownTime()
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringChangeIndication()
     {
     }
 
     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::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 = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -64695,10 +70571,10 @@ class SubscribeAttributeOperationalStateCountdownTime : public SubscribeAttribut
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeCountdownTimeWithParams:params
+        [cluster subscribeAttributeChangeIndicationWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.CountdownTime response %@", [value description]);
+                NSLog(@"ActivatedCarbonFilterMonitoring.ChangeIndication response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64715,34 +70591,34 @@ class SubscribeAttributeOperationalStateCountdownTime : public SubscribeAttribut
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute OperationalStateList
+ * Attribute InPlaceIndicator
  */
-class ReadOperationalStateOperationalStateList : public ReadAttribute {
+class ReadActivatedCarbonFilterMonitoringInPlaceIndicator : public ReadAttribute {
 public:
-    ReadOperationalStateOperationalStateList()
-        : ReadAttribute("operational-state-list")
+    ReadActivatedCarbonFilterMonitoringInPlaceIndicator()
+        : ReadAttribute("in-place-indicator")
     {
     }
 
-    ~ReadOperationalStateOperationalStateList()
+    ~ReadActivatedCarbonFilterMonitoringInPlaceIndicator()
     {
     }
 
     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::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 = [[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 = [[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("OperationalState OperationalStateList read Error", error);
+                LogNSError("ActivatedCarbonFilterMonitoring InPlaceIndicator read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64751,25 +70627,25 @@ class ReadOperationalStateOperationalStateList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateOperationalStateList : public SubscribeAttribute {
+class SubscribeAttributeActivatedCarbonFilterMonitoringInPlaceIndicator : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateOperationalStateList()
-        : SubscribeAttribute("operational-state-list")
+    SubscribeAttributeActivatedCarbonFilterMonitoringInPlaceIndicator()
+        : SubscribeAttribute("in-place-indicator")
     {
     }
 
-    ~SubscribeAttributeOperationalStateOperationalStateList()
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringInPlaceIndicator()
     {
     }
 
     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::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 = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -64780,10 +70656,10 @@ class SubscribeAttributeOperationalStateOperationalStateList : public SubscribeA
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeOperationalStateListWithParams:params
+        [cluster subscribeAttributeInPlaceIndicatorWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.OperationalStateList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ActivatedCarbonFilterMonitoring.InPlaceIndicator response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64800,34 +70676,34 @@ class SubscribeAttributeOperationalStateOperationalStateList : public SubscribeA
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute OperationalState
+ * Attribute LastChangedTime
  */
-class ReadOperationalStateOperationalState : public ReadAttribute {
+class ReadActivatedCarbonFilterMonitoringLastChangedTime : public ReadAttribute {
 public:
-    ReadOperationalStateOperationalState()
-        : ReadAttribute("operational-state")
+    ReadActivatedCarbonFilterMonitoringLastChangedTime()
+        : ReadAttribute("last-changed-time")
     {
     }
 
-    ~ReadOperationalStateOperationalState()
+    ~ReadActivatedCarbonFilterMonitoringLastChangedTime()
     {
     }
 
     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::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 = [[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 = [[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("OperationalState OperationalState read Error", error);
+                LogNSError("ActivatedCarbonFilterMonitoring LastChangedTime read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64836,25 +70712,69 @@ class ReadOperationalStateOperationalState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateOperationalState : public SubscribeAttribute {
+class WriteActivatedCarbonFilterMonitoringLastChangedTime : public WriteAttribute {
 public:
-    SubscribeAttributeOperationalStateOperationalState()
-        : SubscribeAttribute("operational-state")
+    WriteActivatedCarbonFilterMonitoringLastChangedTime()
+        : WriteAttribute("last-changed-time")
     {
+        AddArgument("attr-name", "last-changed-time");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeOperationalStateOperationalState()
+    ~WriteActivatedCarbonFilterMonitoringLastChangedTime()
     {
     }
 
     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::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 = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -64865,10 +70785,10 @@ class SubscribeAttributeOperationalStateOperationalState : public SubscribeAttri
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeOperationalStateWithParams:params
+        [cluster subscribeAttributeLastChangedTimeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.OperationalState response %@", [value description]);
+                NSLog(@"ActivatedCarbonFilterMonitoring.LastChangedTime response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64885,34 +70805,34 @@ class SubscribeAttributeOperationalStateOperationalState : public SubscribeAttri
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute OperationalError
+ * Attribute ReplacementProductList
  */
-class ReadOperationalStateOperationalError : public ReadAttribute {
+class ReadActivatedCarbonFilterMonitoringReplacementProductList : public ReadAttribute {
 public:
-    ReadOperationalStateOperationalError()
-        : ReadAttribute("operational-error")
+    ReadActivatedCarbonFilterMonitoringReplacementProductList()
+        : ReadAttribute("replacement-product-list")
     {
     }
 
-    ~ReadOperationalStateOperationalError()
+    ~ReadActivatedCarbonFilterMonitoringReplacementProductList()
     {
     }
 
     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::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 = [[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 = [[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("OperationalState OperationalError read Error", error);
+                LogNSError("ActivatedCarbonFilterMonitoring ReplacementProductList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -64921,25 +70841,25 @@ class ReadOperationalStateOperationalError : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateOperationalError : public SubscribeAttribute {
+class SubscribeAttributeActivatedCarbonFilterMonitoringReplacementProductList : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateOperationalError()
-        : SubscribeAttribute("operational-error")
+    SubscribeAttributeActivatedCarbonFilterMonitoringReplacementProductList()
+        : SubscribeAttribute("replacement-product-list")
     {
     }
 
-    ~SubscribeAttributeOperationalStateOperationalError()
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringReplacementProductList()
     {
     }
 
     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::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 = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -64950,10 +70870,10 @@ class SubscribeAttributeOperationalStateOperationalError : public SubscribeAttri
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeOperationalErrorWithParams:params
+        [cluster subscribeAttributeReplacementProductListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(MTROperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.OperationalError response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"ActivatedCarbonFilterMonitoring.ReplacementProductList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -64972,32 +70892,32 @@ class SubscribeAttributeOperationalStateOperationalError : public SubscribeAttri
 /*
  * Attribute GeneratedCommandList
  */
-class ReadOperationalStateGeneratedCommandList : public ReadAttribute {
+class ReadActivatedCarbonFilterMonitoringGeneratedCommandList : public ReadAttribute {
 public:
-    ReadOperationalStateGeneratedCommandList()
+    ReadActivatedCarbonFilterMonitoringGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadOperationalStateGeneratedCommandList()
+    ~ReadActivatedCarbonFilterMonitoringGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalState.GeneratedCommandList response %@", [value description]);
+            NSLog(@"ActivatedCarbonFilterMonitoring.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("OperationalState GeneratedCommandList read Error", error);
+                LogNSError("ActivatedCarbonFilterMonitoring GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65006,25 +70926,25 @@ class ReadOperationalStateGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeActivatedCarbonFilterMonitoringGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateGeneratedCommandList()
+    SubscribeAttributeActivatedCarbonFilterMonitoringGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeOperationalStateGeneratedCommandList()
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -65038,7 +70958,7 @@ class SubscribeAttributeOperationalStateGeneratedCommandList : public SubscribeA
         [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.GeneratedCommandList response %@", [value description]);
+                NSLog(@"ActivatedCarbonFilterMonitoring.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -65057,32 +70977,32 @@ class SubscribeAttributeOperationalStateGeneratedCommandList : public SubscribeA
 /*
  * Attribute AcceptedCommandList
  */
-class ReadOperationalStateAcceptedCommandList : public ReadAttribute {
+class ReadActivatedCarbonFilterMonitoringAcceptedCommandList : public ReadAttribute {
 public:
-    ReadOperationalStateAcceptedCommandList()
+    ReadActivatedCarbonFilterMonitoringAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadOperationalStateAcceptedCommandList()
+    ~ReadActivatedCarbonFilterMonitoringAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalState.AcceptedCommandList response %@", [value description]);
+            NSLog(@"ActivatedCarbonFilterMonitoring.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("OperationalState AcceptedCommandList read Error", error);
+                LogNSError("ActivatedCarbonFilterMonitoring AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65091,25 +71011,25 @@ class ReadOperationalStateAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeActivatedCarbonFilterMonitoringAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateAcceptedCommandList()
+    SubscribeAttributeActivatedCarbonFilterMonitoringAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeOperationalStateAcceptedCommandList()
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -65123,7 +71043,7 @@ class SubscribeAttributeOperationalStateAcceptedCommandList : public SubscribeAt
         [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.AcceptedCommandList response %@", [value description]);
+                NSLog(@"ActivatedCarbonFilterMonitoring.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -65142,32 +71062,32 @@ class SubscribeAttributeOperationalStateAcceptedCommandList : public SubscribeAt
 /*
  * Attribute EventList
  */
-class ReadOperationalStateEventList : public ReadAttribute {
+class ReadActivatedCarbonFilterMonitoringEventList : public ReadAttribute {
 public:
-    ReadOperationalStateEventList()
+    ReadActivatedCarbonFilterMonitoringEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadOperationalStateEventList()
+    ~ReadActivatedCarbonFilterMonitoringEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalState.EventList response %@", [value description]);
+            NSLog(@"ActivatedCarbonFilterMonitoring.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("OperationalState EventList read Error", error);
+                LogNSError("ActivatedCarbonFilterMonitoring EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65176,25 +71096,25 @@ class ReadOperationalStateEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateEventList : public SubscribeAttribute {
+class SubscribeAttributeActivatedCarbonFilterMonitoringEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateEventList()
+    SubscribeAttributeActivatedCarbonFilterMonitoringEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeOperationalStateEventList()
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -65208,7 +71128,7 @@ class SubscribeAttributeOperationalStateEventList : public SubscribeAttribute {
         [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.EventList response %@", [value description]);
+                NSLog(@"ActivatedCarbonFilterMonitoring.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -65227,32 +71147,32 @@ class SubscribeAttributeOperationalStateEventList : public SubscribeAttribute {
 /*
  * Attribute AttributeList
  */
-class ReadOperationalStateAttributeList : public ReadAttribute {
+class ReadActivatedCarbonFilterMonitoringAttributeList : public ReadAttribute {
 public:
-    ReadOperationalStateAttributeList()
+    ReadActivatedCarbonFilterMonitoringAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadOperationalStateAttributeList()
+    ~ReadActivatedCarbonFilterMonitoringAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalState.AttributeList response %@", [value description]);
+            NSLog(@"ActivatedCarbonFilterMonitoring.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("OperationalState AttributeList read Error", error);
+                LogNSError("ActivatedCarbonFilterMonitoring AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65261,25 +71181,25 @@ class ReadOperationalStateAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateAttributeList : public SubscribeAttribute {
+class SubscribeAttributeActivatedCarbonFilterMonitoringAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateAttributeList()
+    SubscribeAttributeActivatedCarbonFilterMonitoringAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeOperationalStateAttributeList()
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -65293,7 +71213,7 @@ class SubscribeAttributeOperationalStateAttributeList : public SubscribeAttribut
         [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.AttributeList response %@", [value description]);
+                NSLog(@"ActivatedCarbonFilterMonitoring.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -65312,32 +71232,32 @@ class SubscribeAttributeOperationalStateAttributeList : public SubscribeAttribut
 /*
  * Attribute FeatureMap
  */
-class ReadOperationalStateFeatureMap : public ReadAttribute {
+class ReadActivatedCarbonFilterMonitoringFeatureMap : public ReadAttribute {
 public:
-    ReadOperationalStateFeatureMap()
+    ReadActivatedCarbonFilterMonitoringFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadOperationalStateFeatureMap()
+    ~ReadActivatedCarbonFilterMonitoringFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalState.FeatureMap response %@", [value description]);
+            NSLog(@"ActivatedCarbonFilterMonitoring.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("OperationalState FeatureMap read Error", error);
+                LogNSError("ActivatedCarbonFilterMonitoring FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65346,25 +71266,25 @@ class ReadOperationalStateFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeActivatedCarbonFilterMonitoringFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateFeatureMap()
+    SubscribeAttributeActivatedCarbonFilterMonitoringFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeOperationalStateFeatureMap()
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -65378,7 +71298,7 @@ class SubscribeAttributeOperationalStateFeatureMap : public SubscribeAttribute {
         [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.FeatureMap response %@", [value description]);
+                NSLog(@"ActivatedCarbonFilterMonitoring.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -65397,32 +71317,32 @@ class SubscribeAttributeOperationalStateFeatureMap : public SubscribeAttribute {
 /*
  * Attribute ClusterRevision
  */
-class ReadOperationalStateClusterRevision : public ReadAttribute {
+class ReadActivatedCarbonFilterMonitoringClusterRevision : public ReadAttribute {
 public:
-    ReadOperationalStateClusterRevision()
+    ReadActivatedCarbonFilterMonitoringClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadOperationalStateClusterRevision()
+    ~ReadActivatedCarbonFilterMonitoringClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"OperationalState.ClusterRevision response %@", [value description]);
+            NSLog(@"ActivatedCarbonFilterMonitoring.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("OperationalState ClusterRevision read Error", error);
+                LogNSError("ActivatedCarbonFilterMonitoring ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65431,25 +71351,25 @@ class ReadOperationalStateClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeOperationalStateClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeActivatedCarbonFilterMonitoringClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeOperationalStateClusterRevision()
+    SubscribeAttributeActivatedCarbonFilterMonitoringClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeOperationalStateClusterRevision()
+    ~SubscribeAttributeActivatedCarbonFilterMonitoringClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -65463,7 +71383,7 @@ class SubscribeAttributeOperationalStateClusterRevision : public SubscribeAttrib
         [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"OperationalState.ClusterRevision response %@", [value description]);
+                NSLog(@"ActivatedCarbonFilterMonitoring.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -65480,21 +71400,16 @@ class SubscribeAttributeOperationalStateClusterRevision : public SubscribeAttrib
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster RvcOperationalState                                         | 0x0061 |
+| Cluster BooleanSensorConfiguration                                  | 0x0080 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * Pause                                                             |   0x00 |
-| * Stop                                                              |   0x01 |
-| * Start                                                             |   0x02 |
-| * Resume                                                            |   0x03 |
+| * SuppressRequest                                                   |   0x00 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * PhaseList                                                         | 0x0000 |
-| * CurrentPhase                                                      | 0x0001 |
-| * CountdownTime                                                     | 0x0002 |
-| * OperationalStateList                                              | 0x0003 |
-| * OperationalState                                                  | 0x0004 |
-| * OperationalError                                                  | 0x0005 |
+| * SensitivityLevel                                                  | 0x0000 |
+| * AlarmsActive                                                      | 0x0001 |
+| * AlarmsSuppressed                                                  | 0x0002 |
+| * AlarmsEnabled                                                     | 0x0003 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -65503,250 +71418,221 @@ class SubscribeAttributeOperationalStateClusterRevision : public SubscribeAttrib
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
-| * OperationalError                                                  | 0x0000 |
-| * OperationCompletion                                               | 0x0001 |
+| * AlarmsStateChanged                                                | 0x0000 |
+| * SensorFault                                                       | 0x0001 |
 \*----------------------------------------------------------------------------*/
 
 #if MTR_ENABLE_PROVISIONAL
 /*
- * Command Pause
+ * Command SuppressRequest
  */
-class RvcOperationalStatePause : public ClusterCommand {
+class BooleanSensorConfigurationSuppressRequest : public ClusterCommand {
 public:
-    RvcOperationalStatePause()
-        : ClusterCommand("pause")
+    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::RvcOperationalState::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::RvcOperationalState::Commands::Pause::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, 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];
+        __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 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);
-                                                    }
-                                                }];
+            [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
+
 /*
- * Command Stop
+ * Attribute SensitivityLevel
  */
-class RvcOperationalStateStop : public ClusterCommand {
+class ReadBooleanSensorConfigurationSensitivityLevel : public ReadAttribute {
 public:
-    RvcOperationalStateStop()
-        : ClusterCommand("stop")
+    ReadBooleanSensorConfigurationSensitivityLevel()
+        : ReadAttribute("sensitivity-level")
+    {
+    }
+
+    ~ReadBooleanSensorConfigurationSensitivityLevel()
     {
-        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::BooleanSensorConfiguration::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::BooleanSensorConfiguration::Attributes::SensitivityLevel::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 = [[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;
     }
-
-private:
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-/*
- * Command Start
- */
-class RvcOperationalStateStart : public ClusterCommand {
+class WriteBooleanSensorConfigurationSensitivityLevel : public WriteAttribute {
 public:
-    RvcOperationalStateStart()
-        : ClusterCommand("start")
+    WriteBooleanSensorConfigurationSensitivityLevel()
+        : WriteAttribute("sensitivity-level")
     {
-        ClusterCommand::AddArguments();
+        AddArgument("attr-name", "sensitivity-level");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    ~WriteBooleanSensorConfigurationSensitivityLevel()
     {
-        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);
+    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 = [[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 = [[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;
 };
 
-#endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-/*
- * Command Resume
- */
-class RvcOperationalStateResume : public ClusterCommand {
+class SubscribeAttributeBooleanSensorConfigurationSensitivityLevel : public SubscribeAttribute {
 public:
-    RvcOperationalStateResume()
-        : ClusterCommand("resume")
+    SubscribeAttributeBooleanSensorConfigurationSensitivityLevel()
+        : SubscribeAttribute("sensitivity-level")
     {
-        ClusterCommand::AddArguments();
     }
 
-    CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override
+    ~SubscribeAttributeBooleanSensorConfigurationSensitivityLevel()
     {
-        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);
+    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 = [[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 = [[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;
     }
-
-private:
 };
 
 #endif // MTR_ENABLE_PROVISIONAL
-
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute PhaseList
+ * Attribute AlarmsActive
  */
-class ReadRvcOperationalStatePhaseList : public ReadAttribute {
+class ReadBooleanSensorConfigurationAlarmsActive : public ReadAttribute {
 public:
-    ReadRvcOperationalStatePhaseList()
-        : ReadAttribute("phase-list")
+    ReadBooleanSensorConfigurationAlarmsActive()
+        : ReadAttribute("alarms-active")
     {
     }
 
-    ~ReadRvcOperationalStatePhaseList()
+    ~ReadBooleanSensorConfigurationAlarmsActive()
     {
     }
 
     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::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 = [[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 = [[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("RVCOperationalState PhaseList read Error", error);
+                LogNSError("BooleanSensorConfiguration AlarmsActive read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65755,25 +71641,25 @@ class ReadRvcOperationalStatePhaseList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStatePhaseList : public SubscribeAttribute {
+class SubscribeAttributeBooleanSensorConfigurationAlarmsActive : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStatePhaseList()
-        : SubscribeAttribute("phase-list")
+    SubscribeAttributeBooleanSensorConfigurationAlarmsActive()
+        : SubscribeAttribute("alarms-active")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStatePhaseList()
+    ~SubscribeAttributeBooleanSensorConfigurationAlarmsActive()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -65784,10 +71670,10 @@ class SubscribeAttributeRvcOperationalStatePhaseList : public SubscribeAttribute
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributePhaseListWithParams:params
+        [cluster subscribeAttributeAlarmsActiveWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.PhaseList response %@", [value description]);
+            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BooleanSensorConfiguration.AlarmsActive response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -65804,34 +71690,34 @@ class SubscribeAttributeRvcOperationalStatePhaseList : public SubscribeAttribute
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute CurrentPhase
+ * Attribute AlarmsSuppressed
  */
-class ReadRvcOperationalStateCurrentPhase : public ReadAttribute {
+class ReadBooleanSensorConfigurationAlarmsSuppressed : public ReadAttribute {
 public:
-    ReadRvcOperationalStateCurrentPhase()
-        : ReadAttribute("current-phase")
+    ReadBooleanSensorConfigurationAlarmsSuppressed()
+        : ReadAttribute("alarms-suppressed")
     {
     }
 
-    ~ReadRvcOperationalStateCurrentPhase()
+    ~ReadBooleanSensorConfigurationAlarmsSuppressed()
     {
     }
 
     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::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 = [[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 = [[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("RVCOperationalState CurrentPhase read Error", error);
+                LogNSError("BooleanSensorConfiguration AlarmsSuppressed read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65840,25 +71726,25 @@ class ReadRvcOperationalStateCurrentPhase : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateCurrentPhase : public SubscribeAttribute {
+class SubscribeAttributeBooleanSensorConfigurationAlarmsSuppressed : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateCurrentPhase()
-        : SubscribeAttribute("current-phase")
+    SubscribeAttributeBooleanSensorConfigurationAlarmsSuppressed()
+        : SubscribeAttribute("alarms-suppressed")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateCurrentPhase()
+    ~SubscribeAttributeBooleanSensorConfigurationAlarmsSuppressed()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -65869,10 +71755,10 @@ class SubscribeAttributeRvcOperationalStateCurrentPhase : public SubscribeAttrib
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeCurrentPhaseWithParams:params
+        [cluster subscribeAttributeAlarmsSuppressedWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.CurrentPhase response %@", [value description]);
+                NSLog(@"BooleanSensorConfiguration.AlarmsSuppressed response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -65889,34 +71775,34 @@ class SubscribeAttributeRvcOperationalStateCurrentPhase : public SubscribeAttrib
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute CountdownTime
+ * Attribute AlarmsEnabled
  */
-class ReadRvcOperationalStateCountdownTime : public ReadAttribute {
+class ReadBooleanSensorConfigurationAlarmsEnabled : public ReadAttribute {
 public:
-    ReadRvcOperationalStateCountdownTime()
-        : ReadAttribute("countdown-time")
+    ReadBooleanSensorConfigurationAlarmsEnabled()
+        : ReadAttribute("alarms-enabled")
     {
     }
 
-    ~ReadRvcOperationalStateCountdownTime()
+    ~ReadBooleanSensorConfigurationAlarmsEnabled()
     {
     }
 
     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::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 = [[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 = [[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("RVCOperationalState CountdownTime read Error", error);
+                LogNSError("BooleanSensorConfiguration AlarmsEnabled read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -65925,25 +71811,66 @@ class ReadRvcOperationalStateCountdownTime : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateCountdownTime : public SubscribeAttribute {
+class WriteBooleanSensorConfigurationAlarmsEnabled : public WriteAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateCountdownTime()
-        : SubscribeAttribute("countdown-time")
+    WriteBooleanSensorConfigurationAlarmsEnabled()
+        : WriteAttribute("alarms-enabled")
     {
+        AddArgument("attr-name", "alarms-enabled");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeRvcOperationalStateCountdownTime()
+    ~WriteBooleanSensorConfigurationAlarmsEnabled()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -65954,10 +71881,10 @@ class SubscribeAttributeRvcOperationalStateCountdownTime : public SubscribeAttri
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeCountdownTimeWithParams:params
+        [cluster subscribeAttributeAlarmsEnabledWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.CountdownTime response %@", [value description]);
+                NSLog(@"BooleanSensorConfiguration.AlarmsEnabled response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -65974,34 +71901,34 @@ class SubscribeAttributeRvcOperationalStateCountdownTime : public SubscribeAttri
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute OperationalStateList
+ * Attribute GeneratedCommandList
  */
-class ReadRvcOperationalStateOperationalStateList : public ReadAttribute {
+class ReadBooleanSensorConfigurationGeneratedCommandList : public ReadAttribute {
 public:
-    ReadRvcOperationalStateOperationalStateList()
-        : ReadAttribute("operational-state-list")
+    ReadBooleanSensorConfigurationGeneratedCommandList()
+        : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadRvcOperationalStateOperationalStateList()
+    ~ReadBooleanSensorConfigurationGeneratedCommandList()
     {
     }
 
     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::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 = [[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 = [[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("RVCOperationalState OperationalStateList read Error", error);
+                LogNSError("BooleanSensorConfiguration GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66010,25 +71937,25 @@ class ReadRvcOperationalStateOperationalStateList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateOperationalStateList : public SubscribeAttribute {
+class SubscribeAttributeBooleanSensorConfigurationGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateOperationalStateList()
-        : SubscribeAttribute("operational-state-list")
+    SubscribeAttributeBooleanSensorConfigurationGeneratedCommandList()
+        : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateOperationalStateList()
+    ~SubscribeAttributeBooleanSensorConfigurationGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -66039,10 +71966,10 @@ class SubscribeAttributeRvcOperationalStateOperationalStateList : public Subscri
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeOperationalStateListWithParams:params
+        [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.OperationalStateList response %@", [value description]);
+                NSLog(@"BooleanSensorConfiguration.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66059,34 +71986,34 @@ class SubscribeAttributeRvcOperationalStateOperationalStateList : public Subscri
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute OperationalState
+ * Attribute AcceptedCommandList
  */
-class ReadRvcOperationalStateOperationalState : public ReadAttribute {
+class ReadBooleanSensorConfigurationAcceptedCommandList : public ReadAttribute {
 public:
-    ReadRvcOperationalStateOperationalState()
-        : ReadAttribute("operational-state")
+    ReadBooleanSensorConfigurationAcceptedCommandList()
+        : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadRvcOperationalStateOperationalState()
+    ~ReadBooleanSensorConfigurationAcceptedCommandList()
     {
     }
 
     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::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 = [[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 = [[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("RVCOperationalState OperationalState read Error", error);
+                LogNSError("BooleanSensorConfiguration AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66095,25 +72022,25 @@ class ReadRvcOperationalStateOperationalState : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateOperationalState : public SubscribeAttribute {
+class SubscribeAttributeBooleanSensorConfigurationAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateOperationalState()
-        : SubscribeAttribute("operational-state")
+    SubscribeAttributeBooleanSensorConfigurationAcceptedCommandList()
+        : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateOperationalState()
+    ~SubscribeAttributeBooleanSensorConfigurationAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -66124,10 +72051,10 @@ class SubscribeAttributeRvcOperationalStateOperationalState : public SubscribeAt
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeOperationalStateWithParams:params
+        [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.OperationalState response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BooleanSensorConfiguration.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66144,34 +72071,34 @@ class SubscribeAttributeRvcOperationalStateOperationalState : public SubscribeAt
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute OperationalError
+ * Attribute EventList
  */
-class ReadRvcOperationalStateOperationalError : public ReadAttribute {
+class ReadBooleanSensorConfigurationEventList : public ReadAttribute {
 public:
-    ReadRvcOperationalStateOperationalError()
-        : ReadAttribute("operational-error")
+    ReadBooleanSensorConfigurationEventList()
+        : ReadAttribute("event-list")
     {
     }
 
-    ~ReadRvcOperationalStateOperationalError()
+    ~ReadBooleanSensorConfigurationEventList()
     {
     }
 
     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::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 = [[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 = [[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("RVCOperationalState OperationalError read Error", error);
+                LogNSError("BooleanSensorConfiguration EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66180,25 +72107,25 @@ class ReadRvcOperationalStateOperationalError : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateOperationalError : public SubscribeAttribute {
+class SubscribeAttributeBooleanSensorConfigurationEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateOperationalError()
-        : SubscribeAttribute("operational-error")
+    SubscribeAttributeBooleanSensorConfigurationEventList()
+        : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateOperationalError()
+    ~SubscribeAttributeBooleanSensorConfigurationEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -66209,10 +72136,10 @@ class SubscribeAttributeRvcOperationalStateOperationalError : public SubscribeAt
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeOperationalErrorWithParams:params
+        [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
-            reportHandler:^(MTRRVCOperationalStateClusterErrorStateStruct * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.OperationalError response %@", [value description]);
+            reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
+                NSLog(@"BooleanSensorConfiguration.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66229,34 +72156,34 @@ class SubscribeAttributeRvcOperationalStateOperationalError : public SubscribeAt
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute GeneratedCommandList
+ * Attribute AttributeList
  */
-class ReadRvcOperationalStateGeneratedCommandList : public ReadAttribute {
+class ReadBooleanSensorConfigurationAttributeList : public ReadAttribute {
 public:
-    ReadRvcOperationalStateGeneratedCommandList()
-        : ReadAttribute("generated-command-list")
+    ReadBooleanSensorConfigurationAttributeList()
+        : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadRvcOperationalStateGeneratedCommandList()
+    ~ReadBooleanSensorConfigurationAttributeList()
     {
     }
 
     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::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 = [[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 = [[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("RVCOperationalState GeneratedCommandList read Error", error);
+                LogNSError("BooleanSensorConfiguration AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66265,25 +72192,25 @@ class ReadRvcOperationalStateGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeBooleanSensorConfigurationAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateGeneratedCommandList()
-        : SubscribeAttribute("generated-command-list")
+    SubscribeAttributeBooleanSensorConfigurationAttributeList()
+        : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateGeneratedCommandList()
+    ~SubscribeAttributeBooleanSensorConfigurationAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -66294,10 +72221,10 @@ class SubscribeAttributeRvcOperationalStateGeneratedCommandList : public Subscri
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeGeneratedCommandListWithParams:params
+        [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.GeneratedCommandList response %@", [value description]);
+                NSLog(@"BooleanSensorConfiguration.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66314,34 +72241,34 @@ class SubscribeAttributeRvcOperationalStateGeneratedCommandList : public Subscri
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute AcceptedCommandList
+ * Attribute FeatureMap
  */
-class ReadRvcOperationalStateAcceptedCommandList : public ReadAttribute {
+class ReadBooleanSensorConfigurationFeatureMap : public ReadAttribute {
 public:
-    ReadRvcOperationalStateAcceptedCommandList()
-        : ReadAttribute("accepted-command-list")
+    ReadBooleanSensorConfigurationFeatureMap()
+        : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadRvcOperationalStateAcceptedCommandList()
+    ~ReadBooleanSensorConfigurationFeatureMap()
     {
     }
 
     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::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 = [[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 = [[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("RVCOperationalState AcceptedCommandList read Error", error);
+                LogNSError("BooleanSensorConfiguration FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66350,25 +72277,25 @@ class ReadRvcOperationalStateAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeBooleanSensorConfigurationFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateAcceptedCommandList()
-        : SubscribeAttribute("accepted-command-list")
+    SubscribeAttributeBooleanSensorConfigurationFeatureMap()
+        : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateAcceptedCommandList()
+    ~SubscribeAttributeBooleanSensorConfigurationFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -66379,10 +72306,10 @@ class SubscribeAttributeRvcOperationalStateAcceptedCommandList : public Subscrib
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAcceptedCommandListWithParams:params
+        [cluster subscribeAttributeFeatureMapWithParams: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(@"BooleanSensorConfiguration.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66399,34 +72326,34 @@ class SubscribeAttributeRvcOperationalStateAcceptedCommandList : public Subscrib
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute EventList
+ * Attribute ClusterRevision
  */
-class ReadRvcOperationalStateEventList : public ReadAttribute {
+class ReadBooleanSensorConfigurationClusterRevision : public ReadAttribute {
 public:
-    ReadRvcOperationalStateEventList()
-        : ReadAttribute("event-list")
+    ReadBooleanSensorConfigurationClusterRevision()
+        : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadRvcOperationalStateEventList()
+    ~ReadBooleanSensorConfigurationClusterRevision()
     {
     }
 
     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::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 = [[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 = [[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("RVCOperationalState EventList read Error", error);
+                LogNSError("BooleanSensorConfiguration ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66435,25 +72362,25 @@ class ReadRvcOperationalStateEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateEventList : public SubscribeAttribute {
+class SubscribeAttributeBooleanSensorConfigurationClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateEventList()
-        : SubscribeAttribute("event-list")
+    SubscribeAttributeBooleanSensorConfigurationClusterRevision()
+        : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateEventList()
+    ~SubscribeAttributeBooleanSensorConfigurationClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -66464,10 +72391,10 @@ class SubscribeAttributeRvcOperationalStateEventList : public SubscribeAttribute
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeEventListWithParams:params
+        [cluster subscribeAttributeClusterRevisionWithParams: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(@"BooleanSensorConfiguration.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66480,38 +72407,238 @@ class SubscribeAttributeRvcOperationalStateEventList : public SubscribeAttribute
     }
 };
 
+#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
 /*
- * Attribute AttributeList
+ * Command Open
  */
-class ReadRvcOperationalStateAttributeList : public ReadAttribute {
+class ValveConfigurationAndControlOpen : public ClusterCommand {
 public:
-    ReadRvcOperationalStateAttributeList()
-        : ReadAttribute("attribute-list")
+    ValveConfigurationAndControlOpen()
+        : ClusterCommand("open")
     {
+#if MTR_ENABLE_PROVISIONAL
+        AddArgument("OpenDuration", 0, UINT32_MAX, &mRequest.openDuration);
+#endif // MTR_ENABLE_PROVISIONAL
+        ClusterCommand::AddArguments();
     }
 
-    ~ReadRvcOperationalStateAttributeList()
+    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::RvcOperationalState::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::RvcOperationalState::Attributes::AttributeList::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, 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 = [[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 = [[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("RVCOperationalState AttributeList read Error", error);
+                LogNSError("ValveConfigurationAndControl OpenDuration read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66520,25 +72647,69 @@ class ReadRvcOperationalStateAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateAttributeList : public SubscribeAttribute {
+class WriteValveConfigurationAndControlOpenDuration : public WriteAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateAttributeList()
-        : SubscribeAttribute("attribute-list")
+    WriteValveConfigurationAndControlOpenDuration()
+        : WriteAttribute("open-duration")
     {
+        AddArgument("attr-name", "open-duration");
+        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeRvcOperationalStateAttributeList()
+    ~WriteValveConfigurationAndControlOpenDuration()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -66549,10 +72720,10 @@ class SubscribeAttributeRvcOperationalStateAttributeList : public SubscribeAttri
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeAttributeListWithParams:params
+        [cluster subscribeAttributeOpenDurationWithParams: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(@"ValveConfigurationAndControl.OpenDuration response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66569,34 +72740,34 @@ class SubscribeAttributeRvcOperationalStateAttributeList : public SubscribeAttri
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute FeatureMap
+ * Attribute AutoCloseTime
  */
-class ReadRvcOperationalStateFeatureMap : public ReadAttribute {
+class ReadValveConfigurationAndControlAutoCloseTime : public ReadAttribute {
 public:
-    ReadRvcOperationalStateFeatureMap()
-        : ReadAttribute("feature-map")
+    ReadValveConfigurationAndControlAutoCloseTime()
+        : ReadAttribute("auto-close-time")
     {
     }
 
-    ~ReadRvcOperationalStateFeatureMap()
+    ~ReadValveConfigurationAndControlAutoCloseTime()
     {
     }
 
     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::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 = [[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 = [[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("RVCOperationalState FeatureMap read Error", error);
+                LogNSError("ValveConfigurationAndControl AutoCloseTime read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66605,25 +72776,25 @@ class ReadRvcOperationalStateFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeValveConfigurationAndControlAutoCloseTime : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateFeatureMap()
-        : SubscribeAttribute("feature-map")
+    SubscribeAttributeValveConfigurationAndControlAutoCloseTime()
+        : SubscribeAttribute("auto-close-time")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateFeatureMap()
+    ~SubscribeAttributeValveConfigurationAndControlAutoCloseTime()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -66634,10 +72805,10 @@ class SubscribeAttributeRvcOperationalStateFeatureMap : public SubscribeAttribut
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeFeatureMapWithParams:params
+        [cluster subscribeAttributeAutoCloseTimeWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.FeatureMap response %@", [value description]);
+                NSLog(@"ValveConfigurationAndControl.AutoCloseTime response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66654,34 +72825,34 @@ class SubscribeAttributeRvcOperationalStateFeatureMap : public SubscribeAttribut
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ClusterRevision
+ * Attribute RemainingDuration
  */
-class ReadRvcOperationalStateClusterRevision : public ReadAttribute {
+class ReadValveConfigurationAndControlRemainingDuration : public ReadAttribute {
 public:
-    ReadRvcOperationalStateClusterRevision()
-        : ReadAttribute("cluster-revision")
+    ReadValveConfigurationAndControlRemainingDuration()
+        : ReadAttribute("remaining-duration")
     {
     }
 
-    ~ReadRvcOperationalStateClusterRevision()
+    ~ReadValveConfigurationAndControlRemainingDuration()
     {
     }
 
     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::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 = [[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 = [[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("RVCOperationalState ClusterRevision read Error", error);
+                LogNSError("ValveConfigurationAndControl RemainingDuration read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66690,25 +72861,25 @@ class ReadRvcOperationalStateClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeRvcOperationalStateClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeValveConfigurationAndControlRemainingDuration : public SubscribeAttribute {
 public:
-    SubscribeAttributeRvcOperationalStateClusterRevision()
-        : SubscribeAttribute("cluster-revision")
+    SubscribeAttributeValveConfigurationAndControlRemainingDuration()
+        : SubscribeAttribute("remaining-duration")
     {
     }
 
-    ~SubscribeAttributeRvcOperationalStateClusterRevision()
+    ~SubscribeAttributeValveConfigurationAndControlRemainingDuration()
     {
     }
 
     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::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 = [[MTRBaseClusterRVCOperationalState alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -66719,10 +72890,10 @@ class SubscribeAttributeRvcOperationalStateClusterRevision : public SubscribeAtt
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeClusterRevisionWithParams:params
+        [cluster subscribeAttributeRemainingDurationWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"RVCOperationalState.ClusterRevision response %@", [value description]);
+                NSLog(@"ValveConfigurationAndControl.RemainingDuration response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66735,110 +72906,123 @@ 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
+ * Attribute CurrentState
  */
-class HepaFilterMonitoringResetCondition : public ClusterCommand {
+class ReadValveConfigurationAndControlCurrentState : public ReadAttribute {
 public:
-    HepaFilterMonitoringResetCondition()
-        : ClusterCommand("reset-condition")
+    ReadValveConfigurationAndControlCurrentState()
+        : ReadAttribute("current-state")
+    {
+    }
+
+    ~ReadValveConfigurationAndControlCurrentState()
     {
-        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;
+        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 ") 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 = [[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);
-                                                             }
-                                                         }];
-        }
+        __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;
     }
+};
 
-private:
+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 Condition
+ * Attribute TargetState
  */
-class ReadHepaFilterMonitoringCondition : public ReadAttribute {
+class ReadValveConfigurationAndControlTargetState : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringCondition()
-        : ReadAttribute("condition")
+    ReadValveConfigurationAndControlTargetState()
+        : ReadAttribute("target-state")
     {
     }
 
-    ~ReadHepaFilterMonitoringCondition()
+    ~ReadValveConfigurationAndControlTargetState()
     {
     }
 
     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::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 = [[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 = [[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("HEPAFilterMonitoring Condition read Error", error);
+                LogNSError("ValveConfigurationAndControl TargetState read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66847,25 +73031,25 @@ class ReadHepaFilterMonitoringCondition : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringCondition : public SubscribeAttribute {
+class SubscribeAttributeValveConfigurationAndControlTargetState : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringCondition()
-        : SubscribeAttribute("condition")
+    SubscribeAttributeValveConfigurationAndControlTargetState()
+        : SubscribeAttribute("target-state")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringCondition()
+    ~SubscribeAttributeValveConfigurationAndControlTargetState()
     {
     }
 
     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::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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -66876,10 +73060,10 @@ class SubscribeAttributeHepaFilterMonitoringCondition : public SubscribeAttribut
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeConditionWithParams:params
+        [cluster subscribeAttributeTargetStateWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.Condition response %@", [value description]);
+                NSLog(@"ValveConfigurationAndControl.TargetState response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66896,34 +73080,34 @@ class SubscribeAttributeHepaFilterMonitoringCondition : public SubscribeAttribut
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute DegradationDirection
+ * Attribute StartUpState
  */
-class ReadHepaFilterMonitoringDegradationDirection : public ReadAttribute {
+class ReadValveConfigurationAndControlStartUpState : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringDegradationDirection()
-        : ReadAttribute("degradation-direction")
+    ReadValveConfigurationAndControlStartUpState()
+        : ReadAttribute("start-up-state")
     {
     }
 
-    ~ReadHepaFilterMonitoringDegradationDirection()
+    ~ReadValveConfigurationAndControlStartUpState()
     {
     }
 
     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::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 = [[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 = [[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("HEPAFilterMonitoring DegradationDirection read Error", error);
+                LogNSError("ValveConfigurationAndControl StartUpState read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -66932,25 +73116,66 @@ class ReadHepaFilterMonitoringDegradationDirection : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringDegradationDirection : public SubscribeAttribute {
+class WriteValveConfigurationAndControlStartUpState : public WriteAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringDegradationDirection()
-        : SubscribeAttribute("degradation-direction")
+    WriteValveConfigurationAndControlStartUpState()
+        : WriteAttribute("start-up-state")
     {
+        AddArgument("attr-name", "start-up-state");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringDegradationDirection()
+    ~WriteValveConfigurationAndControlStartUpState()
     {
     }
 
     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::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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -66961,10 +73186,10 @@ class SubscribeAttributeHepaFilterMonitoringDegradationDirection : public Subscr
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeDegradationDirectionWithParams:params
+        [cluster subscribeAttributeStartUpStateWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.DegradationDirection response %@", [value description]);
+                NSLog(@"ValveConfigurationAndControl.StartUpState response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -66981,34 +73206,34 @@ class SubscribeAttributeHepaFilterMonitoringDegradationDirection : public Subscr
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ChangeIndication
+ * Attribute CurrentLevel
  */
-class ReadHepaFilterMonitoringChangeIndication : public ReadAttribute {
+class ReadValveConfigurationAndControlCurrentLevel : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringChangeIndication()
-        : ReadAttribute("change-indication")
+    ReadValveConfigurationAndControlCurrentLevel()
+        : ReadAttribute("current-level")
     {
     }
 
-    ~ReadHepaFilterMonitoringChangeIndication()
+    ~ReadValveConfigurationAndControlCurrentLevel()
     {
     }
 
     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::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 = [[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 = [[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("HEPAFilterMonitoring ChangeIndication read Error", error);
+                LogNSError("ValveConfigurationAndControl CurrentLevel read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -67017,25 +73242,25 @@ class ReadHepaFilterMonitoringChangeIndication : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringChangeIndication : public SubscribeAttribute {
+class SubscribeAttributeValveConfigurationAndControlCurrentLevel : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringChangeIndication()
-        : SubscribeAttribute("change-indication")
+    SubscribeAttributeValveConfigurationAndControlCurrentLevel()
+        : SubscribeAttribute("current-level")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringChangeIndication()
+    ~SubscribeAttributeValveConfigurationAndControlCurrentLevel()
     {
     }
 
     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::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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -67046,10 +73271,10 @@ class SubscribeAttributeHepaFilterMonitoringChangeIndication : public SubscribeA
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeChangeIndicationWithParams:params
+        [cluster subscribeAttributeCurrentLevelWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.ChangeIndication response %@", [value description]);
+                NSLog(@"ValveConfigurationAndControl.CurrentLevel response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -67066,34 +73291,34 @@ class SubscribeAttributeHepaFilterMonitoringChangeIndication : public SubscribeA
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute InPlaceIndicator
+ * Attribute TargetLevel
  */
-class ReadHepaFilterMonitoringInPlaceIndicator : public ReadAttribute {
+class ReadValveConfigurationAndControlTargetLevel : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringInPlaceIndicator()
-        : ReadAttribute("in-place-indicator")
+    ReadValveConfigurationAndControlTargetLevel()
+        : ReadAttribute("target-level")
     {
     }
 
-    ~ReadHepaFilterMonitoringInPlaceIndicator()
+    ~ReadValveConfigurationAndControlTargetLevel()
     {
     }
 
     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;
+        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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
-        [cluster readAttributeInPlaceIndicatorWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"HEPAFilterMonitoring.InPlaceIndicator response %@", [value description]);
+        __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("HEPAFilterMonitoring InPlaceIndicator read Error", error);
+                LogNSError("ValveConfigurationAndControl TargetLevel read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -67102,25 +73327,25 @@ class ReadHepaFilterMonitoringInPlaceIndicator : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringInPlaceIndicator : public SubscribeAttribute {
+class SubscribeAttributeValveConfigurationAndControlTargetLevel : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringInPlaceIndicator()
-        : SubscribeAttribute("in-place-indicator")
+    SubscribeAttributeValveConfigurationAndControlTargetLevel()
+        : SubscribeAttribute("target-level")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringInPlaceIndicator()
+    ~SubscribeAttributeValveConfigurationAndControlTargetLevel()
     {
     }
 
     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::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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -67131,10 +73356,10 @@ class SubscribeAttributeHepaFilterMonitoringInPlaceIndicator : public SubscribeA
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeInPlaceIndicatorWithParams:params
+        [cluster subscribeAttributeTargetLevelWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.InPlaceIndicator response %@", [value description]);
+                NSLog(@"ValveConfigurationAndControl.TargetLevel response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -67151,34 +73376,34 @@ class SubscribeAttributeHepaFilterMonitoringInPlaceIndicator : public SubscribeA
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute LastChangedTime
+ * Attribute OpenLevel
  */
-class ReadHepaFilterMonitoringLastChangedTime : public ReadAttribute {
+class ReadValveConfigurationAndControlOpenLevel : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringLastChangedTime()
-        : ReadAttribute("last-changed-time")
+    ReadValveConfigurationAndControlOpenLevel()
+        : ReadAttribute("open-level")
     {
     }
 
-    ~ReadHepaFilterMonitoringLastChangedTime()
+    ~ReadValveConfigurationAndControlOpenLevel()
     {
     }
 
     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::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 = [[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 = [[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("HEPAFilterMonitoring LastChangedTime read Error", error);
+                LogNSError("ValveConfigurationAndControl OpenLevel read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -67187,39 +73412,39 @@ class ReadHepaFilterMonitoringLastChangedTime : public ReadAttribute {
     }
 };
 
-class WriteHepaFilterMonitoringLastChangedTime : public WriteAttribute {
+class WriteValveConfigurationAndControlOpenLevel : public WriteAttribute {
 public:
-    WriteHepaFilterMonitoringLastChangedTime()
-        : WriteAttribute("last-changed-time")
+    WriteValveConfigurationAndControlOpenLevel()
+        : WriteAttribute("open-level")
     {
-        AddArgument("attr-name", "last-changed-time");
-        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        AddArgument("attr-name", "open-level");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteHepaFilterMonitoringLastChangedTime()
+    ~WriteValveConfigurationAndControlOpenLevel()
     {
     }
 
     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::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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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()];
+            value = [NSNumber numberWithUnsignedChar:mValue.Value()];
         }
 
-        [cluster writeAttributeLastChangedTimeWithValue:value params:params completion:^(NSError * _Nullable error) {
+        [cluster writeAttributeOpenLevelWithValue:value params:params completion:^(NSError * _Nullable error) {
             if (error != nil) {
-                LogNSError("HEPAFilterMonitoring LastChangedTime write Error", error);
+                LogNSError("ValveConfigurationAndControl OpenLevel write Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -67228,28 +73453,28 @@ class WriteHepaFilterMonitoringLastChangedTime : public WriteAttribute {
     }
 
 private:
-    chip::app::DataModel::Nullable<uint32_t> mValue;
+    chip::app::DataModel::Nullable<chip::Percent> mValue;
 };
 
-class SubscribeAttributeHepaFilterMonitoringLastChangedTime : public SubscribeAttribute {
+class SubscribeAttributeValveConfigurationAndControlOpenLevel : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringLastChangedTime()
-        : SubscribeAttribute("last-changed-time")
+    SubscribeAttributeValveConfigurationAndControlOpenLevel()
+        : SubscribeAttribute("open-level")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringLastChangedTime()
+    ~SubscribeAttributeValveConfigurationAndControlOpenLevel()
     {
     }
 
     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::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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -67260,10 +73485,10 @@ class SubscribeAttributeHepaFilterMonitoringLastChangedTime : public SubscribeAt
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeLastChangedTimeWithParams:params
+        [cluster subscribeAttributeOpenLevelWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.LastChangedTime response %@", [value description]);
+                NSLog(@"ValveConfigurationAndControl.OpenLevel response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -67280,34 +73505,34 @@ class SubscribeAttributeHepaFilterMonitoringLastChangedTime : public SubscribeAt
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ReplacementProductList
+ * Attribute ValveFault
  */
-class ReadHepaFilterMonitoringReplacementProductList : public ReadAttribute {
+class ReadValveConfigurationAndControlValveFault : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringReplacementProductList()
-        : ReadAttribute("replacement-product-list")
+    ReadValveConfigurationAndControlValveFault()
+        : ReadAttribute("valve-fault")
     {
     }
 
-    ~ReadHepaFilterMonitoringReplacementProductList()
+    ~ReadValveConfigurationAndControlValveFault()
     {
     }
 
     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::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 = [[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 = [[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("HEPAFilterMonitoring ReplacementProductList read Error", error);
+                LogNSError("ValveConfigurationAndControl ValveFault read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -67316,25 +73541,25 @@ class ReadHepaFilterMonitoringReplacementProductList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringReplacementProductList : public SubscribeAttribute {
+class SubscribeAttributeValveConfigurationAndControlValveFault : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringReplacementProductList()
-        : SubscribeAttribute("replacement-product-list")
+    SubscribeAttributeValveConfigurationAndControlValveFault()
+        : SubscribeAttribute("valve-fault")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringReplacementProductList()
+    ~SubscribeAttributeValveConfigurationAndControlValveFault()
     {
     }
 
     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::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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -67345,10 +73570,10 @@ class SubscribeAttributeHepaFilterMonitoringReplacementProductList : public Subs
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeReplacementProductListWithParams:params
+        [cluster subscribeAttributeValveFaultWithParams: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(@"ValveConfigurationAndControl.ValveFault response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -67367,32 +73592,32 @@ class SubscribeAttributeHepaFilterMonitoringReplacementProductList : public Subs
 /*
  * Attribute GeneratedCommandList
  */
-class ReadHepaFilterMonitoringGeneratedCommandList : public ReadAttribute {
+class ReadValveConfigurationAndControlGeneratedCommandList : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringGeneratedCommandList()
+    ReadValveConfigurationAndControlGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadHepaFilterMonitoringGeneratedCommandList()
+    ~ReadValveConfigurationAndControlGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"HEPAFilterMonitoring.GeneratedCommandList response %@", [value description]);
+            NSLog(@"ValveConfigurationAndControl.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("HEPAFilterMonitoring GeneratedCommandList read Error", error);
+                LogNSError("ValveConfigurationAndControl GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -67401,25 +73626,25 @@ class ReadHepaFilterMonitoringGeneratedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeValveConfigurationAndControlGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringGeneratedCommandList()
+    SubscribeAttributeValveConfigurationAndControlGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringGeneratedCommandList()
+    ~SubscribeAttributeValveConfigurationAndControlGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -67433,7 +73658,7 @@ class SubscribeAttributeHepaFilterMonitoringGeneratedCommandList : public Subscr
         [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.GeneratedCommandList response %@", [value description]);
+                NSLog(@"ValveConfigurationAndControl.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -67452,32 +73677,32 @@ class SubscribeAttributeHepaFilterMonitoringGeneratedCommandList : public Subscr
 /*
  * Attribute AcceptedCommandList
  */
-class ReadHepaFilterMonitoringAcceptedCommandList : public ReadAttribute {
+class ReadValveConfigurationAndControlAcceptedCommandList : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringAcceptedCommandList()
+    ReadValveConfigurationAndControlAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadHepaFilterMonitoringAcceptedCommandList()
+    ~ReadValveConfigurationAndControlAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"HEPAFilterMonitoring.AcceptedCommandList response %@", [value description]);
+            NSLog(@"ValveConfigurationAndControl.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("HEPAFilterMonitoring AcceptedCommandList read Error", error);
+                LogNSError("ValveConfigurationAndControl AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -67486,25 +73711,25 @@ class ReadHepaFilterMonitoringAcceptedCommandList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeValveConfigurationAndControlAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringAcceptedCommandList()
+    SubscribeAttributeValveConfigurationAndControlAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringAcceptedCommandList()
+    ~SubscribeAttributeValveConfigurationAndControlAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -67518,7 +73743,7 @@ class SubscribeAttributeHepaFilterMonitoringAcceptedCommandList : public Subscri
         [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.AcceptedCommandList response %@", [value description]);
+                NSLog(@"ValveConfigurationAndControl.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -67537,32 +73762,32 @@ class SubscribeAttributeHepaFilterMonitoringAcceptedCommandList : public Subscri
 /*
  * Attribute EventList
  */
-class ReadHepaFilterMonitoringEventList : public ReadAttribute {
+class ReadValveConfigurationAndControlEventList : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringEventList()
+    ReadValveConfigurationAndControlEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadHepaFilterMonitoringEventList()
+    ~ReadValveConfigurationAndControlEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"HEPAFilterMonitoring.EventList response %@", [value description]);
+            NSLog(@"ValveConfigurationAndControl.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("HEPAFilterMonitoring EventList read Error", error);
+                LogNSError("ValveConfigurationAndControl EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -67571,25 +73796,25 @@ class ReadHepaFilterMonitoringEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringEventList : public SubscribeAttribute {
+class SubscribeAttributeValveConfigurationAndControlEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringEventList()
+    SubscribeAttributeValveConfigurationAndControlEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringEventList()
+    ~SubscribeAttributeValveConfigurationAndControlEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -67603,7 +73828,7 @@ class SubscribeAttributeHepaFilterMonitoringEventList : public SubscribeAttribut
         [cluster subscribeAttributeEventListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.EventList response %@", [value description]);
+                NSLog(@"ValveConfigurationAndControl.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -67622,32 +73847,32 @@ class SubscribeAttributeHepaFilterMonitoringEventList : public SubscribeAttribut
 /*
  * Attribute AttributeList
  */
-class ReadHepaFilterMonitoringAttributeList : public ReadAttribute {
+class ReadValveConfigurationAndControlAttributeList : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringAttributeList()
+    ReadValveConfigurationAndControlAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadHepaFilterMonitoringAttributeList()
+    ~ReadValveConfigurationAndControlAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"HEPAFilterMonitoring.AttributeList response %@", [value description]);
+            NSLog(@"ValveConfigurationAndControl.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("HEPAFilterMonitoring AttributeList read Error", error);
+                LogNSError("ValveConfigurationAndControl AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -67656,25 +73881,25 @@ class ReadHepaFilterMonitoringAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringAttributeList : public SubscribeAttribute {
+class SubscribeAttributeValveConfigurationAndControlAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringAttributeList()
+    SubscribeAttributeValveConfigurationAndControlAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringAttributeList()
+    ~SubscribeAttributeValveConfigurationAndControlAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -67688,7 +73913,7 @@ class SubscribeAttributeHepaFilterMonitoringAttributeList : public SubscribeAttr
         [cluster subscribeAttributeAttributeListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.AttributeList response %@", [value description]);
+                NSLog(@"ValveConfigurationAndControl.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -67707,32 +73932,32 @@ class SubscribeAttributeHepaFilterMonitoringAttributeList : public SubscribeAttr
 /*
  * Attribute FeatureMap
  */
-class ReadHepaFilterMonitoringFeatureMap : public ReadAttribute {
+class ReadValveConfigurationAndControlFeatureMap : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringFeatureMap()
+    ReadValveConfigurationAndControlFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadHepaFilterMonitoringFeatureMap()
+    ~ReadValveConfigurationAndControlFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"HEPAFilterMonitoring.FeatureMap response %@", [value description]);
+            NSLog(@"ValveConfigurationAndControl.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("HEPAFilterMonitoring FeatureMap read Error", error);
+                LogNSError("ValveConfigurationAndControl FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -67741,25 +73966,25 @@ class ReadHepaFilterMonitoringFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeValveConfigurationAndControlFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringFeatureMap()
+    SubscribeAttributeValveConfigurationAndControlFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringFeatureMap()
+    ~SubscribeAttributeValveConfigurationAndControlFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -67773,7 +73998,7 @@ class SubscribeAttributeHepaFilterMonitoringFeatureMap : public SubscribeAttribu
         [cluster subscribeAttributeFeatureMapWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.FeatureMap response %@", [value description]);
+                NSLog(@"ValveConfigurationAndControl.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -67792,32 +74017,32 @@ class SubscribeAttributeHepaFilterMonitoringFeatureMap : public SubscribeAttribu
 /*
  * Attribute ClusterRevision
  */
-class ReadHepaFilterMonitoringClusterRevision : public ReadAttribute {
+class ReadValveConfigurationAndControlClusterRevision : public ReadAttribute {
 public:
-    ReadHepaFilterMonitoringClusterRevision()
+    ReadValveConfigurationAndControlClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadHepaFilterMonitoringClusterRevision()
+    ~ReadValveConfigurationAndControlClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterValveConfigurationAndControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"HEPAFilterMonitoring.ClusterRevision response %@", [value description]);
+            NSLog(@"ValveConfigurationAndControl.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("HEPAFilterMonitoring ClusterRevision read Error", error);
+                LogNSError("ValveConfigurationAndControl ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -67826,25 +74051,25 @@ class ReadHepaFilterMonitoringClusterRevision : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeHepaFilterMonitoringClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeValveConfigurationAndControlClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeHepaFilterMonitoringClusterRevision()
+    SubscribeAttributeValveConfigurationAndControlClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeHepaFilterMonitoringClusterRevision()
+    ~SubscribeAttributeValveConfigurationAndControlClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterHEPAFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -67858,7 +74083,7 @@ class SubscribeAttributeHepaFilterMonitoringClusterRevision : public SubscribeAt
         [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"HEPAFilterMonitoring.ClusterRevision response %@", [value description]);
+                NSLog(@"ValveConfigurationAndControl.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -67875,18 +74100,25 @@ class SubscribeAttributeHepaFilterMonitoringClusterRevision : public SubscribeAt
 #endif // MTR_ENABLE_PROVISIONAL
 #if MTR_ENABLE_PROVISIONAL
 /*----------------------------------------------------------------------------*\
-| Cluster ActivatedCarbonFilterMonitoring                             | 0x0072 |
+| Cluster DemandResponseLoadControl                                   | 0x0096 |
 |------------------------------------------------------------------------------|
 | Commands:                                                           |        |
-| * ResetCondition                                                    |   0x00 |
+| * RegisterLoadControlProgramRequest                                 |   0x00 |
+| * UnregisterLoadControlProgramRequest                               |   0x01 |
+| * AddLoadControlEventRequest                                        |   0x02 |
+| * RemoveLoadControlEventRequest                                     |   0x03 |
+| * ClearLoadControlEventsRequest                                     |   0x04 |
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
-| * Condition                                                         | 0x0000 |
-| * DegradationDirection                                              | 0x0001 |
-| * ChangeIndication                                                  | 0x0002 |
-| * InPlaceIndicator                                                  | 0x0003 |
-| * LastChangedTime                                                   | 0x0004 |
-| * ReplacementProductList                                            | 0x0005 |
+| * DeviceClass                                                       | 0x0000 |
+| * LoadControlPrograms                                               | 0x0001 |
+| * NumberOfLoadControlPrograms                                       | 0x0002 |
+| * Events                                                            | 0x0003 |
+| * ActiveEvents                                                      | 0x0004 |
+| * NumberOfEventsPerProgram                                          | 0x0005 |
+| * NumberOfTransistions                                              | 0x0006 |
+| * DefaultRandomStart                                                | 0x0007 |
+| * DefaultRandomDuration                                             | 0x0008 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -67895,86 +74127,421 @@ class SubscribeAttributeHepaFilterMonitoringClusterRevision : public SubscribeAt
 | * ClusterRevision                                                   | 0xFFFD |
 |------------------------------------------------------------------------------|
 | Events:                                                             |        |
+| * LoadControlEventStatusChange                                      | 0x0000 |
 \*----------------------------------------------------------------------------*/
 
 #if MTR_ENABLE_PROVISIONAL
 /*
- * Command ResetCondition
+ * Command RegisterLoadControlProgramRequest
  */
-class ActivatedCarbonFilterMonitoringResetCondition : public ClusterCommand {
+class DemandResponseLoadControlRegisterLoadControlProgramRequest : public ClusterCommand {
 public:
-    ActivatedCarbonFilterMonitoringResetCondition()
-        : ClusterCommand("reset-condition")
+    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::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::CommandId commandId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Commands::ResetCondition::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, 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];
+        __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 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);
-                                                             }
-                                                         }];
+            [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
 /*
- * Attribute Condition
+ * Command AddLoadControlEventRequest
  */
-class ReadActivatedCarbonFilterMonitoringCondition : public ReadAttribute {
+class DemandResponseLoadControlAddLoadControlEventRequest : public ClusterCommand {
 public:
-    ReadActivatedCarbonFilterMonitoringCondition()
-        : ReadAttribute("condition")
+    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();
     }
 
-    ~ReadActivatedCarbonFilterMonitoringCondition()
+    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:chip::to_underlying(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::ActivatedCarbonFilterMonitoring::Id;
-        constexpr chip::AttributeId attributeId = chip::app::Clusters::ActivatedCarbonFilterMonitoring::Attributes::Condition::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, 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 DeviceClass
+ */
+class ReadDemandResponseLoadControlDeviceClass : public ReadAttribute {
+public:
+    ReadDemandResponseLoadControlDeviceClass()
+        : ReadAttribute("device-class")
+    {
+    }
+
+    ~ReadDemandResponseLoadControlDeviceClass()
+    {
+    }
+
+    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::DeviceClass::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%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 = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeDeviceClassWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DemandResponseLoadControl.DeviceClass response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring Condition read Error", error);
+                LogNSError("DemandResponseLoadControl DeviceClass read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -67983,25 +74550,25 @@ class ReadActivatedCarbonFilterMonitoringCondition : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringCondition : public SubscribeAttribute {
+class SubscribeAttributeDemandResponseLoadControlDeviceClass : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringCondition()
-        : SubscribeAttribute("condition")
+    SubscribeAttributeDemandResponseLoadControlDeviceClass()
+        : SubscribeAttribute("device-class")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringCondition()
+    ~SubscribeAttributeDemandResponseLoadControlDeviceClass()
     {
     }
 
     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::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::DeviceClass::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%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 = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -68012,10 +74579,10 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringCondition : public Subscr
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeConditionWithParams:params
+        [cluster subscribeAttributeDeviceClassWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ActivatedCarbonFilterMonitoring.Condition response %@", [value description]);
+                NSLog(@"DemandResponseLoadControl.DeviceClass response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -68032,34 +74599,34 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringCondition : public Subscr
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute DegradationDirection
+ * Attribute LoadControlPrograms
  */
-class ReadActivatedCarbonFilterMonitoringDegradationDirection : public ReadAttribute {
+class ReadDemandResponseLoadControlLoadControlPrograms : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringDegradationDirection()
-        : ReadAttribute("degradation-direction")
+    ReadDemandResponseLoadControlLoadControlPrograms()
+        : ReadAttribute("load-control-programs")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringDegradationDirection()
+    ~ReadDemandResponseLoadControlLoadControlPrograms()
     {
     }
 
     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::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 = [[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 = [[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("ActivatedCarbonFilterMonitoring DegradationDirection read Error", error);
+                LogNSError("DemandResponseLoadControl LoadControlPrograms read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -68068,25 +74635,25 @@ class ReadActivatedCarbonFilterMonitoringDegradationDirection : public ReadAttri
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringDegradationDirection : public SubscribeAttribute {
+class SubscribeAttributeDemandResponseLoadControlLoadControlPrograms : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringDegradationDirection()
-        : SubscribeAttribute("degradation-direction")
+    SubscribeAttributeDemandResponseLoadControlLoadControlPrograms()
+        : SubscribeAttribute("load-control-programs")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringDegradationDirection()
+    ~SubscribeAttributeDemandResponseLoadControlLoadControlPrograms()
     {
     }
 
     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::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 = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -68097,10 +74664,95 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringDegradationDirection : pu
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeDegradationDirectionWithParams:params
+        [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(@"ActivatedCarbonFilterMonitoring.DegradationDirection response %@", [value description]);
+                NSLog(@"DemandResponseLoadControl.NumberOfLoadControlPrograms response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -68117,34 +74769,34 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringDegradationDirection : pu
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ChangeIndication
+ * Attribute Events
  */
-class ReadActivatedCarbonFilterMonitoringChangeIndication : public ReadAttribute {
+class ReadDemandResponseLoadControlEvents : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringChangeIndication()
-        : ReadAttribute("change-indication")
+    ReadDemandResponseLoadControlEvents()
+        : ReadAttribute("events")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringChangeIndication()
+    ~ReadDemandResponseLoadControlEvents()
     {
     }
 
     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::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 = [[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 = [[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("ActivatedCarbonFilterMonitoring ChangeIndication read Error", error);
+                LogNSError("DemandResponseLoadControl Events read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -68153,25 +74805,25 @@ class ReadActivatedCarbonFilterMonitoringChangeIndication : public ReadAttribute
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringChangeIndication : public SubscribeAttribute {
+class SubscribeAttributeDemandResponseLoadControlEvents : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringChangeIndication()
-        : SubscribeAttribute("change-indication")
+    SubscribeAttributeDemandResponseLoadControlEvents()
+        : SubscribeAttribute("events")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringChangeIndication()
+    ~SubscribeAttributeDemandResponseLoadControlEvents()
     {
     }
 
     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::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 = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -68182,10 +74834,180 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringChangeIndication : public
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeChangeIndicationWithParams:params
+        [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(@"ActivatedCarbonFilterMonitoring.ChangeIndication response %@", [value description]);
+                NSLog(@"DemandResponseLoadControl.NumberOfEventsPerProgram response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -68202,34 +75024,34 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringChangeIndication : public
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute InPlaceIndicator
+ * Attribute NumberOfTransistions
  */
-class ReadActivatedCarbonFilterMonitoringInPlaceIndicator : public ReadAttribute {
+class ReadDemandResponseLoadControlNumberOfTransistions : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringInPlaceIndicator()
-        : ReadAttribute("in-place-indicator")
+    ReadDemandResponseLoadControlNumberOfTransistions()
+        : ReadAttribute("number-of-transistions")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringInPlaceIndicator()
+    ~ReadDemandResponseLoadControlNumberOfTransistions()
     {
     }
 
     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::DemandResponseLoadControl::Id;
+        constexpr chip::AttributeId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::NumberOfTransistions::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%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 = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        [cluster readAttributeNumberOfTransistionsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
+            NSLog(@"DemandResponseLoadControl.NumberOfTransistions response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring InPlaceIndicator read Error", error);
+                LogNSError("DemandResponseLoadControl NumberOfTransistions read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -68238,25 +75060,25 @@ class ReadActivatedCarbonFilterMonitoringInPlaceIndicator : public ReadAttribute
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringInPlaceIndicator : public SubscribeAttribute {
+class SubscribeAttributeDemandResponseLoadControlNumberOfTransistions : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringInPlaceIndicator()
-        : SubscribeAttribute("in-place-indicator")
+    SubscribeAttributeDemandResponseLoadControlNumberOfTransistions()
+        : SubscribeAttribute("number-of-transistions")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringInPlaceIndicator()
+    ~SubscribeAttributeDemandResponseLoadControlNumberOfTransistions()
     {
     }
 
     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::DemandResponseLoadControl::Id;
+        constexpr chip::CommandId attributeId = chip::app::Clusters::DemandResponseLoadControl::Attributes::NumberOfTransistions::Id;
 
         ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%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 = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)];
         if (mKeepSubscriptions.HasValue()) {
             params.replaceExistingSubscriptions = !mKeepSubscriptions.Value();
@@ -68267,10 +75089,10 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringInPlaceIndicator : public
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeInPlaceIndicatorWithParams:params
+        [cluster subscribeAttributeNumberOfTransistionsWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ActivatedCarbonFilterMonitoring.InPlaceIndicator response %@", [value description]);
+                NSLog(@"DemandResponseLoadControl.NumberOfTransistions response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -68287,34 +75109,34 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringInPlaceIndicator : public
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute LastChangedTime
+ * Attribute DefaultRandomStart
  */
-class ReadActivatedCarbonFilterMonitoringLastChangedTime : public ReadAttribute {
+class ReadDemandResponseLoadControlDefaultRandomStart : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringLastChangedTime()
-        : ReadAttribute("last-changed-time")
+    ReadDemandResponseLoadControlDefaultRandomStart()
+        : ReadAttribute("default-random-start")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringLastChangedTime()
+    ~ReadDemandResponseLoadControlDefaultRandomStart()
     {
     }
 
     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::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 = [[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 = [[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("ActivatedCarbonFilterMonitoring LastChangedTime read Error", error);
+                LogNSError("DemandResponseLoadControl DefaultRandomStart read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -68323,39 +75145,36 @@ class ReadActivatedCarbonFilterMonitoringLastChangedTime : public ReadAttribute
     }
 };
 
-class WriteActivatedCarbonFilterMonitoringLastChangedTime : public WriteAttribute {
+class WriteDemandResponseLoadControlDefaultRandomStart : public WriteAttribute {
 public:
-    WriteActivatedCarbonFilterMonitoringLastChangedTime()
-        : WriteAttribute("last-changed-time")
+    WriteDemandResponseLoadControlDefaultRandomStart()
+        : WriteAttribute("default-random-start")
     {
-        AddArgument("attr-name", "last-changed-time");
-        AddArgument("attr-value", 0, UINT32_MAX, &mValue);
+        AddArgument("attr-name", "default-random-start");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
         WriteAttribute::AddArguments();
     }
 
-    ~WriteActivatedCarbonFilterMonitoringLastChangedTime()
+    ~WriteDemandResponseLoadControlDefaultRandomStart()
     {
     }
 
     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::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 = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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 * _Nullable value = nil;
-        if (!mValue.IsNull()) {
-            value = [NSNumber numberWithUnsignedInt:mValue.Value()];
-        }
+        NSNumber * _Nonnull value = [NSNumber numberWithUnsignedChar:mValue];
 
-        [cluster writeAttributeLastChangedTimeWithValue:value params:params completion:^(NSError * _Nullable error) {
+        [cluster writeAttributeDefaultRandomStartWithValue:value params:params completion:^(NSError * _Nullable error) {
             if (error != nil) {
-                LogNSError("ActivatedCarbonFilterMonitoring LastChangedTime write Error", error);
+                LogNSError("DemandResponseLoadControl DefaultRandomStart write Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -68364,28 +75183,28 @@ class WriteActivatedCarbonFilterMonitoringLastChangedTime : public WriteAttribut
     }
 
 private:
-    chip::app::DataModel::Nullable<uint32_t> mValue;
+    uint8_t mValue;
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringLastChangedTime : public SubscribeAttribute {
+class SubscribeAttributeDemandResponseLoadControlDefaultRandomStart : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringLastChangedTime()
-        : SubscribeAttribute("last-changed-time")
+    SubscribeAttributeDemandResponseLoadControlDefaultRandomStart()
+        : SubscribeAttribute("default-random-start")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringLastChangedTime()
+    ~SubscribeAttributeDemandResponseLoadControlDefaultRandomStart()
     {
     }
 
     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::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 = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -68396,10 +75215,10 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringLastChangedTime : public
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeLastChangedTimeWithParams:params
+        [cluster subscribeAttributeDefaultRandomStartWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ActivatedCarbonFilterMonitoring.LastChangedTime response %@", [value description]);
+                NSLog(@"DemandResponseLoadControl.DefaultRandomStart response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -68416,34 +75235,34 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringLastChangedTime : public
 #if MTR_ENABLE_PROVISIONAL
 
 /*
- * Attribute ReplacementProductList
+ * Attribute DefaultRandomDuration
  */
-class ReadActivatedCarbonFilterMonitoringReplacementProductList : public ReadAttribute {
+class ReadDemandResponseLoadControlDefaultRandomDuration : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringReplacementProductList()
-        : ReadAttribute("replacement-product-list")
+    ReadDemandResponseLoadControlDefaultRandomDuration()
+        : ReadAttribute("default-random-duration")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringReplacementProductList()
+    ~ReadDemandResponseLoadControlDefaultRandomDuration()
     {
     }
 
     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::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 = [[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 = [[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("ActivatedCarbonFilterMonitoring ReplacementProductList read Error", error);
+                LogNSError("DemandResponseLoadControl DefaultRandomDuration read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -68452,25 +75271,66 @@ class ReadActivatedCarbonFilterMonitoringReplacementProductList : public ReadAtt
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringReplacementProductList : public SubscribeAttribute {
+class WriteDemandResponseLoadControlDefaultRandomDuration : public WriteAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringReplacementProductList()
-        : SubscribeAttribute("replacement-product-list")
+    WriteDemandResponseLoadControlDefaultRandomDuration()
+        : WriteAttribute("default-random-duration")
     {
+        AddArgument("attr-name", "default-random-duration");
+        AddArgument("attr-value", 0, UINT8_MAX, &mValue);
+        WriteAttribute::AddArguments();
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringReplacementProductList()
+    ~WriteDemandResponseLoadControlDefaultRandomDuration()
     {
     }
 
     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::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 = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -68481,10 +75341,10 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringReplacementProductList :
         if (mAutoResubscribe.HasValue()) {
             params.resubscribeAutomatically = mAutoResubscribe.Value();
         }
-        [cluster subscribeAttributeReplacementProductListWithParams:params
+        [cluster subscribeAttributeDefaultRandomDurationWithParams: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(@"DemandResponseLoadControl.DefaultRandomDuration response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -68503,32 +75363,32 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringReplacementProductList :
 /*
  * Attribute GeneratedCommandList
  */
-class ReadActivatedCarbonFilterMonitoringGeneratedCommandList : public ReadAttribute {
+class ReadDemandResponseLoadControlGeneratedCommandList : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringGeneratedCommandList()
+    ReadDemandResponseLoadControlGeneratedCommandList()
         : ReadAttribute("generated-command-list")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringGeneratedCommandList()
+    ~ReadDemandResponseLoadControlGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ActivatedCarbonFilterMonitoring.GeneratedCommandList response %@", [value description]);
+            NSLog(@"DemandResponseLoadControl.GeneratedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring GeneratedCommandList read Error", error);
+                LogNSError("DemandResponseLoadControl GeneratedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -68537,25 +75397,25 @@ class ReadActivatedCarbonFilterMonitoringGeneratedCommandList : public ReadAttri
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringGeneratedCommandList : public SubscribeAttribute {
+class SubscribeAttributeDemandResponseLoadControlGeneratedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringGeneratedCommandList()
+    SubscribeAttributeDemandResponseLoadControlGeneratedCommandList()
         : SubscribeAttribute("generated-command-list")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringGeneratedCommandList()
+    ~SubscribeAttributeDemandResponseLoadControlGeneratedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -68569,7 +75429,7 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringGeneratedCommandList : pu
         [cluster subscribeAttributeGeneratedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ActivatedCarbonFilterMonitoring.GeneratedCommandList response %@", [value description]);
+                NSLog(@"DemandResponseLoadControl.GeneratedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -68588,32 +75448,32 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringGeneratedCommandList : pu
 /*
  * Attribute AcceptedCommandList
  */
-class ReadActivatedCarbonFilterMonitoringAcceptedCommandList : public ReadAttribute {
+class ReadDemandResponseLoadControlAcceptedCommandList : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringAcceptedCommandList()
+    ReadDemandResponseLoadControlAcceptedCommandList()
         : ReadAttribute("accepted-command-list")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringAcceptedCommandList()
+    ~ReadDemandResponseLoadControlAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ActivatedCarbonFilterMonitoring.AcceptedCommandList response %@", [value description]);
+            NSLog(@"DemandResponseLoadControl.AcceptedCommandList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring AcceptedCommandList read Error", error);
+                LogNSError("DemandResponseLoadControl AcceptedCommandList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -68622,25 +75482,25 @@ class ReadActivatedCarbonFilterMonitoringAcceptedCommandList : public ReadAttrib
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringAcceptedCommandList : public SubscribeAttribute {
+class SubscribeAttributeDemandResponseLoadControlAcceptedCommandList : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringAcceptedCommandList()
+    SubscribeAttributeDemandResponseLoadControlAcceptedCommandList()
         : SubscribeAttribute("accepted-command-list")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringAcceptedCommandList()
+    ~SubscribeAttributeDemandResponseLoadControlAcceptedCommandList()
     {
     }
 
     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::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 = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -68654,7 +75514,7 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringAcceptedCommandList : pub
         [cluster subscribeAttributeAcceptedCommandListWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ActivatedCarbonFilterMonitoring.AcceptedCommandList response %@", [value description]);
+                NSLog(@"DemandResponseLoadControl.AcceptedCommandList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -68673,32 +75533,32 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringAcceptedCommandList : pub
 /*
  * Attribute EventList
  */
-class ReadActivatedCarbonFilterMonitoringEventList : public ReadAttribute {
+class ReadDemandResponseLoadControlEventList : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringEventList()
+    ReadDemandResponseLoadControlEventList()
         : ReadAttribute("event-list")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringEventList()
+    ~ReadDemandResponseLoadControlEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ActivatedCarbonFilterMonitoring.EventList response %@", [value description]);
+            NSLog(@"DemandResponseLoadControl.EventList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring EventList read Error", error);
+                LogNSError("DemandResponseLoadControl EventList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -68707,25 +75567,25 @@ class ReadActivatedCarbonFilterMonitoringEventList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringEventList : public SubscribeAttribute {
+class SubscribeAttributeDemandResponseLoadControlEventList : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringEventList()
+    SubscribeAttributeDemandResponseLoadControlEventList()
         : SubscribeAttribute("event-list")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringEventList()
+    ~SubscribeAttributeDemandResponseLoadControlEventList()
     {
     }
 
     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::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 = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -68739,7 +75599,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(@"DemandResponseLoadControl.EventList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -68758,32 +75618,32 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringEventList : public Subscr
 /*
  * Attribute AttributeList
  */
-class ReadActivatedCarbonFilterMonitoringAttributeList : public ReadAttribute {
+class ReadDemandResponseLoadControlAttributeList : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringAttributeList()
+    ReadDemandResponseLoadControlAttributeList()
         : ReadAttribute("attribute-list")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringAttributeList()
+    ~ReadDemandResponseLoadControlAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ActivatedCarbonFilterMonitoring.AttributeList response %@", [value description]);
+            NSLog(@"DemandResponseLoadControl.AttributeList response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring AttributeList read Error", error);
+                LogNSError("DemandResponseLoadControl AttributeList read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -68792,25 +75652,25 @@ class ReadActivatedCarbonFilterMonitoringAttributeList : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringAttributeList : public SubscribeAttribute {
+class SubscribeAttributeDemandResponseLoadControlAttributeList : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringAttributeList()
+    SubscribeAttributeDemandResponseLoadControlAttributeList()
         : SubscribeAttribute("attribute-list")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringAttributeList()
+    ~SubscribeAttributeDemandResponseLoadControlAttributeList()
     {
     }
 
     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::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 = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -68824,7 +75684,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(@"DemandResponseLoadControl.AttributeList response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -68843,32 +75703,32 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringAttributeList : public Su
 /*
  * Attribute FeatureMap
  */
-class ReadActivatedCarbonFilterMonitoringFeatureMap : public ReadAttribute {
+class ReadDemandResponseLoadControlFeatureMap : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringFeatureMap()
+    ReadDemandResponseLoadControlFeatureMap()
         : ReadAttribute("feature-map")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringFeatureMap()
+    ~ReadDemandResponseLoadControlFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ActivatedCarbonFilterMonitoring.FeatureMap response %@", [value description]);
+            NSLog(@"DemandResponseLoadControl.FeatureMap response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring FeatureMap read Error", error);
+                LogNSError("DemandResponseLoadControl FeatureMap read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -68877,25 +75737,25 @@ class ReadActivatedCarbonFilterMonitoringFeatureMap : public ReadAttribute {
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringFeatureMap : public SubscribeAttribute {
+class SubscribeAttributeDemandResponseLoadControlFeatureMap : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringFeatureMap()
+    SubscribeAttributeDemandResponseLoadControlFeatureMap()
         : SubscribeAttribute("feature-map")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringFeatureMap()
+    ~SubscribeAttributeDemandResponseLoadControlFeatureMap()
     {
     }
 
     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::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 = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -68909,7 +75769,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(@"DemandResponseLoadControl.FeatureMap response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -68928,32 +75788,32 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringFeatureMap : public Subsc
 /*
  * Attribute ClusterRevision
  */
-class ReadActivatedCarbonFilterMonitoringClusterRevision : public ReadAttribute {
+class ReadDemandResponseLoadControlClusterRevision : public ReadAttribute {
 public:
-    ReadActivatedCarbonFilterMonitoringClusterRevision()
+    ReadDemandResponseLoadControlClusterRevision()
         : ReadAttribute("cluster-revision")
     {
     }
 
-    ~ReadActivatedCarbonFilterMonitoringClusterRevision()
+    ~ReadDemandResponseLoadControlClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __auto_type * cluster = [[MTRBaseClusterDemandResponseLoadControl alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
         [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-            NSLog(@"ActivatedCarbonFilterMonitoring.ClusterRevision response %@", [value description]);
+            NSLog(@"DemandResponseLoadControl.ClusterRevision response %@", [value description]);
             if (error == nil) {
                 RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
             } else {
-                LogNSError("ActivatedCarbonFilterMonitoring ClusterRevision read Error", error);
+                LogNSError("DemandResponseLoadControl ClusterRevision read Error", error);
                 RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error);
             }
             SetCommandExitStatus(error);
@@ -68962,25 +75822,25 @@ class ReadActivatedCarbonFilterMonitoringClusterRevision : public ReadAttribute
     }
 };
 
-class SubscribeAttributeActivatedCarbonFilterMonitoringClusterRevision : public SubscribeAttribute {
+class SubscribeAttributeDemandResponseLoadControlClusterRevision : public SubscribeAttribute {
 public:
-    SubscribeAttributeActivatedCarbonFilterMonitoringClusterRevision()
+    SubscribeAttributeDemandResponseLoadControlClusterRevision()
         : SubscribeAttribute("cluster-revision")
     {
     }
 
-    ~SubscribeAttributeActivatedCarbonFilterMonitoringClusterRevision()
+    ~SubscribeAttributeDemandResponseLoadControlClusterRevision()
     {
     }
 
     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::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 = [[MTRBaseClusterActivatedCarbonFilterMonitoring alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue];
+        __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();
@@ -68994,7 +75854,7 @@ class SubscribeAttributeActivatedCarbonFilterMonitoringClusterRevision : public
         [cluster subscribeAttributeClusterRevisionWithParams:params
             subscriptionEstablished:^() { mSubscriptionEstablished = YES; }
             reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                NSLog(@"ActivatedCarbonFilterMonitoring.ClusterRevision response %@", [value description]);
+                NSLog(@"DemandResponseLoadControl.ClusterRevision response %@", [value description]);
                 if (error == nil) {
                     RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value);
                 } else {
@@ -70092,7 +76952,9 @@ class DoorLockUnboltDoor : public ClusterCommand {
     DoorLockUnboltDoor()
         : ClusterCommand("unbolt-door")
     {
+#if MTR_ENABLE_PROVISIONAL
         AddArgument("PINCode", &mRequest.PINCode);
+#endif // MTR_ENABLE_PROVISIONAL
         ClusterCommand::AddArguments();
     }
 
@@ -70107,11 +76969,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--) {
@@ -87277,9 +94141,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();
     }
 
@@ -87294,17 +94164,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--) {
@@ -119820,6 +126696,7 @@ class SubscribeAttributeRadonConcentrationMeasurementClusterRevision : public Su
 |------------------------------------------------------------------------------|
 | Attributes:                                                         |        |
 | * MACAddress                                                        | 0x0000 |
+| * LinkLocalAddress                                                  | 0x0001 |
 | * GeneratedCommandList                                              | 0xFFF8 |
 | * AcceptedCommandList                                               | 0xFFF9 |
 | * EventList                                                         | 0xFFFA |
@@ -119912,6 +126789,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
  */
@@ -126122,47 +133085,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()
@@ -154478,8 +161400,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();
     }
 
@@ -154494,8 +161420,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--) {
@@ -155278,10 +162208,8 @@ void registerClusterScenes(Commands & commands)
         make_unique<ReadScenesSceneTableSize>(), //
         make_unique<SubscribeAttributeScenesSceneTableSize>(), //
 #endif // MTR_ENABLE_PROVISIONAL
-#if MTR_ENABLE_PROVISIONAL
-        make_unique<ReadScenesRemainingCapacity>(), //
-        make_unique<SubscribeAttributeScenesRemainingCapacity>(), //
-#endif // MTR_ENABLE_PROVISIONAL
+        make_unique<ReadScenesFabricSceneInfo>(), //
+        make_unique<SubscribeAttributeScenesFabricSceneInfo>(), //
         make_unique<ReadScenesGeneratedCommandList>(), //
         make_unique<SubscribeAttributeScenesGeneratedCommandList>(), //
         make_unique<ReadScenesAcceptedCommandList>(), //
@@ -155770,6 +162698,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>(), //
@@ -156151,6 +163087,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), //
@@ -157106,6 +164045,133 @@ 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 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 registerClusterModeSelect(Commands & commands)
 {
     using namespace chip::app::Clusters::ModeSelect;
@@ -158253,6 +165319,261 @@ 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<ReadDemandResponseLoadControlDeviceClass>(), //
+        make_unique<SubscribeAttributeDemandResponseLoadControlDeviceClass>(), //
+#endif // MTR_ENABLE_PROVISIONAL
+#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<ReadDemandResponseLoadControlNumberOfTransistions>(), //
+        make_unique<SubscribeAttributeDemandResponseLoadControlNumberOfTransistions>(), //
+#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 registerClusterDoorLock(Commands & commands)
 {
     using namespace chip::app::Clusters::DoorLock;
@@ -160228,6 +167549,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>(), //
@@ -160485,7 +167810,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>(), //
@@ -161358,6 +168682,8 @@ void registerClusters(Commands & commands)
     registerClusterUserLabel(commands);
     registerClusterBooleanState(commands);
     registerClusterIcdManagement(commands);
+    registerClusterTimer(commands);
+    registerClusterOvenMode(commands);
     registerClusterModeSelect(commands);
     registerClusterLaundryWasherMode(commands);
     registerClusterRefrigeratorAndTemperatureControlledCabinetMode(commands);
@@ -161376,6 +168702,9 @@ void registerClusters(Commands & commands)
     registerClusterRvcOperationalState(commands);
     registerClusterHepaFilterMonitoring(commands);
     registerClusterActivatedCarbonFilterMonitoring(commands);
+    registerClusterBooleanSensorConfiguration(commands);
+    registerClusterValveConfigurationAndControl(commands);
+    registerClusterDemandResponseLoadControl(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 8613471b1d7068..dce1f3a5024ac7 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");
@@ -296,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");
@@ -739,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));
 
@@ -759,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));
 
@@ -904,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));
 
@@ -924,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));
 
@@ -982,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();
@@ -1001,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));
 
@@ -1054,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();
@@ -1073,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));
 
@@ -1131,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();
@@ -1150,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));
 
@@ -1211,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();
@@ -1230,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));
 
@@ -1326,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();
@@ -1345,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));
 
@@ -1521,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();
@@ -1540,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));
 
@@ -1777,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();
@@ -1796,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));
 
@@ -1925,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));
 
@@ -1945,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));
 
@@ -1973,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));
 
@@ -1993,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));
 
@@ -2013,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));
 
@@ -2189,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));
 
@@ -2213,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));
 
@@ -2237,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));
 
@@ -2267,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));
 
@@ -2296,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));
 
@@ -2317,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));
 
@@ -2341,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));
 
@@ -2482,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));
 
@@ -2504,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));
 
@@ -2526,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));
 
@@ -2858,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));
 
@@ -2882,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));
 
@@ -2915,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));
 
@@ -2935,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));
 
@@ -2972,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));
 
@@ -2992,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));
 
@@ -3029,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));
 
@@ -3049,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));
 
@@ -3086,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();
@@ -3113,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();
@@ -3140,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();
@@ -3167,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();
@@ -3194,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();
@@ -3221,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();
@@ -3248,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();
@@ -3280,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();
@@ -3299,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));
 
@@ -3331,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));
 
@@ -3351,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));
 
@@ -3759,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));
 
@@ -3779,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));
 
@@ -3801,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));
 
@@ -3822,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));
 
@@ -3842,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));
 
@@ -3866,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();
@@ -3883,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));
 
@@ -3955,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));
 
@@ -3975,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();
@@ -3994,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();
@@ -4014,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();
@@ -4033,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));
 
@@ -4057,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();
@@ -4074,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));
 
@@ -4146,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));
 
@@ -4166,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();
@@ -4185,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();
@@ -4205,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();
@@ -4224,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();
@@ -4247,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();
@@ -4264,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));
 
@@ -4336,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));
 
@@ -4356,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();
@@ -4375,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();
@@ -4395,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();
@@ -4414,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();
@@ -4437,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();
@@ -4454,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));
 
@@ -4502,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));
 
@@ -4522,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();
@@ -4541,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();
@@ -4561,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();
@@ -4580,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();
@@ -4603,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();
@@ -4620,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();
@@ -4657,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));
 
@@ -4986,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));
 
@@ -5028,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));
 
@@ -5072,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));
 
@@ -5167,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));
 
@@ -5248,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));
 
@@ -5276,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));
 
@@ -5294,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 DUT Endpoint 0 Basic Information cluster VendorID attribute - 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();
@@ -5311,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();
@@ -5338,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 DUT Endpoint 0 Basic Information cluster VendorID attribute - 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));
 
@@ -5386,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));
 
@@ -5408,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));
 
@@ -5629,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));
 
@@ -5653,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));
 
@@ -5677,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));
 
@@ -5696,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));
 
@@ -5715,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));
 
@@ -5734,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));
 
@@ -5753,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));
 
@@ -5780,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));
 
@@ -5806,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));
 
@@ -5825,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));
 
@@ -5944,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));
 
@@ -6122,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));
 
@@ -6146,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));
 
@@ -6170,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));
 
@@ -6197,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));
 
@@ -6223,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));
 
@@ -6247,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));
 
@@ -6366,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));
 
@@ -6706,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));
 
@@ -6730,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));
 
@@ -6754,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));
 
@@ -6781,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));
 
@@ -6807,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));
 
@@ -6828,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));
 
@@ -6849,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));
 
@@ -6870,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));
 
@@ -6891,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));
 
@@ -6912,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));
 
@@ -6933,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));
 
@@ -6954,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));
 
@@ -6975,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));
 
@@ -6996,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));
 
@@ -7017,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));
 
@@ -7038,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));
 
@@ -7059,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));
 
@@ -7080,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));
 
@@ -7101,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));
 
@@ -7125,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));
 
@@ -7305,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));
 
@@ -7329,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));
 
@@ -7353,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));
 
@@ -7381,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));
 
@@ -7408,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));
 
@@ -7439,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));
 
@@ -7459,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));
 
@@ -7628,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));
 
@@ -7652,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));
 
@@ -7676,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));
 
@@ -7703,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));
 
@@ -7729,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));
 
@@ -7753,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));
 
@@ -8711,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));
 
@@ -8735,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));
 
@@ -8759,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));
 
@@ -8778,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));
 
@@ -8797,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));
 
@@ -8816,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));
 
@@ -8835,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));
 
@@ -8854,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));
 
@@ -8884,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));
 
@@ -8913,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));
 
@@ -8934,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));
 
@@ -8955,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));
 
@@ -8976,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));
 
@@ -8997,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));
 
@@ -9018,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));
 
@@ -9039,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));
 
@@ -9060,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));
 
@@ -9081,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));
 
@@ -9102,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));
 
@@ -9123,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));
 
@@ -9144,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));
 
@@ -9165,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));
 
@@ -9186,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));
 
@@ -9207,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));
 
@@ -9228,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));
 
@@ -9249,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));
 
@@ -9270,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));
 
@@ -9291,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));
 
@@ -9312,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));
 
@@ -9333,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));
 
@@ -9354,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));
 
@@ -9375,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));
 
@@ -9396,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));
 
@@ -9417,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));
 
@@ -9438,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));
 
@@ -9459,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));
 
@@ -9480,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));
 
@@ -9501,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));
 
@@ -9522,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));
 
@@ -9543,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));
 
@@ -9564,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));
 
@@ -9585,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));
 
@@ -9606,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));
 
@@ -9627,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));
 
@@ -9648,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));
 
@@ -9669,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));
 
@@ -9690,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));
 
@@ -9711,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));
 
@@ -9732,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));
 
@@ -9753,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));
 
@@ -9774,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));
 
@@ -9795,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));
 
@@ -9816,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));
 
@@ -9837,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));
 
@@ -9858,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));
 
@@ -9879,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));
 
@@ -9900,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));
 
@@ -9921,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));
 
@@ -9942,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));
 
@@ -9963,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));
 
@@ -9984,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));
 
@@ -10005,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));
 
@@ -10026,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));
 
@@ -10047,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));
 
@@ -10068,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));
 
@@ -10089,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));
 
@@ -10110,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));
 
@@ -10131,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));
 
@@ -10152,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));
 
@@ -10173,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));
 
@@ -10194,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));
 
@@ -10215,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));
 
@@ -10236,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));
 
@@ -10257,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));
 
@@ -10278,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));
 
@@ -10299,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));
 
@@ -10320,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));
 
@@ -11007,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));
 
@@ -11029,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));
 
@@ -11051,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));
 
@@ -11073,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));
 
@@ -11095,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));
 
@@ -11117,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));
 
@@ -11139,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));
 
@@ -11159,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));
 
@@ -11181,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));
 
@@ -11203,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));
 
@@ -11225,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));
 
@@ -11247,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));
 
@@ -11269,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));
 
@@ -11291,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));
 
@@ -11313,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));
 
@@ -11335,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));
 
@@ -11357,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));
 
@@ -11380,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));
 
@@ -11402,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));
 
@@ -11429,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));
 
@@ -11451,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));
 
@@ -11473,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));
 
@@ -11495,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));
 
@@ -11520,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));
 
@@ -11725,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));
 
@@ -11747,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));
 
@@ -11769,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));
 
@@ -11791,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));
 
@@ -11813,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));
 
@@ -11838,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));
 
@@ -11860,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));
 
@@ -11882,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));
 
@@ -11907,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));
 
@@ -11929,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));
 
@@ -11951,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));
 
@@ -12393,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));
 
@@ -12412,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));
 
@@ -12442,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));
 
@@ -12478,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));
 
@@ -12504,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));
 
@@ -12533,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));
 
@@ -12572,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));
 
@@ -12590,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));
 
@@ -12619,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));
 
@@ -12652,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));
 
@@ -12688,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));
 
@@ -12714,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));
 
@@ -12743,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));
 
@@ -12782,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));
 
@@ -12800,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));
 
@@ -12829,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));
 
@@ -12850,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));
 
@@ -12876,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));
 
@@ -12903,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));
 
@@ -12921,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));
 
@@ -13295,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));
 
@@ -13314,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));
 
@@ -13344,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));
 
@@ -13382,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));
 
@@ -13408,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));
 
@@ -13437,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));
 
@@ -13466,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));
 
@@ -13499,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));
 
@@ -13537,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));
 
@@ -13563,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));
 
@@ -13592,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));
 
@@ -13621,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));
 
@@ -13642,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));
 
@@ -13668,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));
 
@@ -13695,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));
 
@@ -13713,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));
 
@@ -14012,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));
 
@@ -14031,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));
 
@@ -14059,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));
 
@@ -14095,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));
 
@@ -14121,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));
 
@@ -14150,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));
 
@@ -14179,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));
 
@@ -14208,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));
 
@@ -14229,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));
 
@@ -14255,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));
 
@@ -14282,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));
 
@@ -14300,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));
 
@@ -14773,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));
 
@@ -14792,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));
 
@@ -14820,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));
 
@@ -14856,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));
 
@@ -14882,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));
 
@@ -14911,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));
 
@@ -14940,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));
 
@@ -14971,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));
 
@@ -15007,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));
 
@@ -15033,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));
 
@@ -15062,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));
 
@@ -15091,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));
 
@@ -15122,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));
 
@@ -15158,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));
 
@@ -15184,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));
 
@@ -15215,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));
 
@@ -15233,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));
 
@@ -15262,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));
 
@@ -15283,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));
 
@@ -15309,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));
 
@@ -15336,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));
 
@@ -15354,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));
 
@@ -15794,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));
 
@@ -15813,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));
 
@@ -15841,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));
 
@@ -15879,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));
 
@@ -15905,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));
 
@@ -15934,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));
 
@@ -15963,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));
 
@@ -15996,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));
 
@@ -16022,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));
 
@@ -16053,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));
 
@@ -16091,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));
 
@@ -16117,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));
 
@@ -16146,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));
 
@@ -16175,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));
 
@@ -16208,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));
 
@@ -16234,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));
 
@@ -16257,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));
 
@@ -16283,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));
 
@@ -16310,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));
 
@@ -16328,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));
 
@@ -16658,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));
 
@@ -16677,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));
 
@@ -16707,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));
 
@@ -16733,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));
 
@@ -16754,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));
 
@@ -16787,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));
 
@@ -16813,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));
 
@@ -16834,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));
 
@@ -16863,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));
 
@@ -16884,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));
 
@@ -16914,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));
 
@@ -16935,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));
 
@@ -16956,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));
 
@@ -16982,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));
 
@@ -17009,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));
 
@@ -17027,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));
 
@@ -17797,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));
 
@@ -17816,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));
 
@@ -17846,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));
 
@@ -17872,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));
 
@@ -17893,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));
 
@@ -17926,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));
 
@@ -17952,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));
 
@@ -17973,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));
 
@@ -18002,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));
 
@@ -18023,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));
 
@@ -18052,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));
 
@@ -18073,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));
 
@@ -18097,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));
 
@@ -18115,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));
 
@@ -18139,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));
 
@@ -18169,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));
 
@@ -18195,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));
 
@@ -18216,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));
 
@@ -18238,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));
 
@@ -18268,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));
 
@@ -18294,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));
 
@@ -18317,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));
 
@@ -18352,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));
 
@@ -18378,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));
 
@@ -18401,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));
 
@@ -18436,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));
 
@@ -18462,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));
 
@@ -18483,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));
 
@@ -18507,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));
 
@@ -18525,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));
 
@@ -18549,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));
 
@@ -18579,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));
 
@@ -18605,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));
 
@@ -18626,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));
 
@@ -18648,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));
 
@@ -18678,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));
 
@@ -18704,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));
 
@@ -18725,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));
 
@@ -18758,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));
 
@@ -18784,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));
 
@@ -18807,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));
 
@@ -18842,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));
 
@@ -18868,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));
 
@@ -18889,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));
 
@@ -18910,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));
 
@@ -18936,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));
 
@@ -18963,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));
 
@@ -18981,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));
 
@@ -19322,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));
 
@@ -19341,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));
 
@@ -19371,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));
 
@@ -19407,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));
 
@@ -19433,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));
 
@@ -19454,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));
 
@@ -19483,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));
 
@@ -19504,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));
 
@@ -19534,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));
 
@@ -19559,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));
 
@@ -19589,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));
 
@@ -19607,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));
 
@@ -19628,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));
 
@@ -19649,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));
 
@@ -19675,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));
 
@@ -19702,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));
 
@@ -19720,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));
 
@@ -20028,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));
 
@@ -20047,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));
 
@@ -20077,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));
 
@@ -20115,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));
 
@@ -20141,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));
 
@@ -20162,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));
 
@@ -20191,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));
 
@@ -20212,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));
 
@@ -20241,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));
 
@@ -20262,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));
 
@@ -20283,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));
 
@@ -20309,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));
 
@@ -20336,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));
 
@@ -20354,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));
 
@@ -20693,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));
 
@@ -20712,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));
 
@@ -20731,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));
 
@@ -20757,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));
 
@@ -20782,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));
 
@@ -20814,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));
 
@@ -20850,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));
 
@@ -20876,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));
 
@@ -20905,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));
 
@@ -20934,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));
 
@@ -20963,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));
 
@@ -20984,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));
 
@@ -21010,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));
 
@@ -21037,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));
 
@@ -21063,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));
 
@@ -21376,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));
 
@@ -21395,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));
 
@@ -21413,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));
 
@@ -21435,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));
 
@@ -21457,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));
 
@@ -21479,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));
 
@@ -21515,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));
 
@@ -21578,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));
 
@@ -21606,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));
 
@@ -21629,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));
 
@@ -21655,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));
 
@@ -21682,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));
 
@@ -21708,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));
 
@@ -22126,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));
 
@@ -22145,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));
 
@@ -22175,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));
 
@@ -22213,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));
 
@@ -22239,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));
 
@@ -22268,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));
 
@@ -22297,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));
 
@@ -22326,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));
 
@@ -22359,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));
 
@@ -22397,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));
 
@@ -22423,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));
 
@@ -22452,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));
 
@@ -22481,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));
 
@@ -22510,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));
 
@@ -22531,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));
 
@@ -22557,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));
 
@@ -22584,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));
 
@@ -22602,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));
 
@@ -22932,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));
 
@@ -22951,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));
 
@@ -22981,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));
 
@@ -23007,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));
 
@@ -23028,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));
 
@@ -23061,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));
 
@@ -23087,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));
 
@@ -23109,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));
 
@@ -23138,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));
 
@@ -23160,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));
 
@@ -23189,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));
 
@@ -23212,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));
 
@@ -23235,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));
 
@@ -23261,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));
 
@@ -23288,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));
 
@@ -23306,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));
 
@@ -23913,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));
 
@@ -23932,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));
 
@@ -23962,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));
 
@@ -24004,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));
 
@@ -24022,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));
 
@@ -24061,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));
 
@@ -24079,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));
 
@@ -24118,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));
 
@@ -24136,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));
 
@@ -24175,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));
 
@@ -24193,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));
 
@@ -24232,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));
 
@@ -24250,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));
 
@@ -24273,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));
 
@@ -24305,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));
 
@@ -24327,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));
 
@@ -24357,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));
 
@@ -24395,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));
 
@@ -24413,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));
 
@@ -24437,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));
 
@@ -24459,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));
 
@@ -24498,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));
 
@@ -24516,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));
 
@@ -24555,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));
 
@@ -24573,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));
 
@@ -24596,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));
 
@@ -24628,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));
 
@@ -24650,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));
 
@@ -24680,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));
 
@@ -24718,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));
 
@@ -24736,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));
 
@@ -24760,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));
 
@@ -24782,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));
 
@@ -24817,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));
 
@@ -24843,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));
 
@@ -24882,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));
 
@@ -24900,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));
 
@@ -24939,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));
 
@@ -24957,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));
 
@@ -24980,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));
 
@@ -25012,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));
 
@@ -25034,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));
 
@@ -25064,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));
 
@@ -25102,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));
 
@@ -25120,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));
 
@@ -25144,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));
 
@@ -25166,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));
 
@@ -25205,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));
 
@@ -25223,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));
 
@@ -25262,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));
 
@@ -25280,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));
 
@@ -25303,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));
 
@@ -25335,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));
 
@@ -25357,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));
 
@@ -25387,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));
 
@@ -25425,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));
 
@@ -25443,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));
 
@@ -25467,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));
 
@@ -25489,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));
 
@@ -25513,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));
 
@@ -25531,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));
 
@@ -25851,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));
 
@@ -25870,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));
 
@@ -25900,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));
 
@@ -25942,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));
 
@@ -25960,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));
 
@@ -25983,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));
 
@@ -26006,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));
 
@@ -26029,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));
 
@@ -26068,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));
 
@@ -26086,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));
 
@@ -26109,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));
 
@@ -26141,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));
 
@@ -26163,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));
 
@@ -26193,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));
 
@@ -26231,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));
 
@@ -26249,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));
 
@@ -26281,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));
 
@@ -26303,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));
 
@@ -26333,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));
 
@@ -26371,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));
 
@@ -26389,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));
 
@@ -26413,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));
 
@@ -26435,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));
 
@@ -26459,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));
 
@@ -26477,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));
 
@@ -26887,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));
 
@@ -26911,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));
 
@@ -26930,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));
 
@@ -26949,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));
 
@@ -26968,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));
 
@@ -26987,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));
 
@@ -27006,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));
 
@@ -27025,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));
 
@@ -27044,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));
 
@@ -27063,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));
 
@@ -27082,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));
 
@@ -27101,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));
 
@@ -27120,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));
 
@@ -27139,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));
 
@@ -27158,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));
 
@@ -27185,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));
 
@@ -27211,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));
 
@@ -27232,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));
 
@@ -27253,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));
 
@@ -27277,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));
 
@@ -27302,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));
 
@@ -27324,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));
 
@@ -27346,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));
 
@@ -27368,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));
 
@@ -27390,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));
 
@@ -27411,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));
 
@@ -27432,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));
 
@@ -27456,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));
 
@@ -27675,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));
 
@@ -27703,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));
 
@@ -27730,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));
 
@@ -27755,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));
 
@@ -27780,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));
 
@@ -27802,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));
 
@@ -27827,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));
 
@@ -27849,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));
 
@@ -27871,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));
 
@@ -27893,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));
 
@@ -28302,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));
 
@@ -28326,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));
 
@@ -28345,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));
 
@@ -28364,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));
 
@@ -28383,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));
 
@@ -28402,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));
 
@@ -28421,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));
 
@@ -28440,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));
 
@@ -28459,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));
 
@@ -28478,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));
 
@@ -28497,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));
 
@@ -28516,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));
 
@@ -28535,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));
 
@@ -28554,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));
 
@@ -28573,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));
 
@@ -28600,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));
 
@@ -28626,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));
 
@@ -28647,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));
 
@@ -28668,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));
 
@@ -28692,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));
 
@@ -28717,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));
 
@@ -28739,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));
 
@@ -28761,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));
 
@@ -28783,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));
 
@@ -28805,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));
 
@@ -28826,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));
 
@@ -28847,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));
 
@@ -28871,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));
 
@@ -29090,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));
 
@@ -29118,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));
 
@@ -29145,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));
 
@@ -29170,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));
 
@@ -29195,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));
 
@@ -29217,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));
 
@@ -29242,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));
 
@@ -29264,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));
 
@@ -29286,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));
 
@@ -29308,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));
 
@@ -29717,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));
 
@@ -29741,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));
 
@@ -29760,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));
 
@@ -29779,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));
 
@@ -29798,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));
 
@@ -29817,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));
 
@@ -29836,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));
 
@@ -29855,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));
 
@@ -29874,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));
 
@@ -29893,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));
 
@@ -29912,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));
 
@@ -29931,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));
 
@@ -29950,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));
 
@@ -29969,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));
 
@@ -29988,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));
 
@@ -30015,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));
 
@@ -30041,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));
 
@@ -30062,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));
 
@@ -30083,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));
 
@@ -30107,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));
 
@@ -30132,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));
 
@@ -30154,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));
 
@@ -30176,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));
 
@@ -30198,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));
 
@@ -30220,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));
 
@@ -30241,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));
 
@@ -30262,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));
 
@@ -30286,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));
 
@@ -30505,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));
 
@@ -30533,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));
 
@@ -30560,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));
 
@@ -30585,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));
 
@@ -30610,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));
 
@@ -30632,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));
 
@@ -30657,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));
 
@@ -30679,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));
 
@@ -30701,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));
 
@@ -30723,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));
 
@@ -31132,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));
 
@@ -31156,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));
 
@@ -31175,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));
 
@@ -31194,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));
 
@@ -31213,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));
 
@@ -31232,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));
 
@@ -31251,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));
 
@@ -31270,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));
 
@@ -31289,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));
 
@@ -31308,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));
 
@@ -31327,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));
 
@@ -31346,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));
 
@@ -31365,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));
 
@@ -31384,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));
 
@@ -31403,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));
 
@@ -31430,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));
 
@@ -31456,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));
 
@@ -31477,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));
 
@@ -31498,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));
 
@@ -31522,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));
 
@@ -31547,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));
 
@@ -31569,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));
 
@@ -31591,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));
 
@@ -31613,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));
 
@@ -31635,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));
 
@@ -31656,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));
 
@@ -31677,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));
 
@@ -31701,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));
 
@@ -31920,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));
 
@@ -31948,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));
 
@@ -31975,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));
 
@@ -32000,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));
 
@@ -32025,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));
 
@@ -32047,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));
 
@@ -32072,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));
 
@@ -32094,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));
 
@@ -32116,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));
 
@@ -32138,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));
 
@@ -32547,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));
 
@@ -32571,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));
 
@@ -32590,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));
 
@@ -32609,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));
 
@@ -32628,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));
 
@@ -32647,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));
 
@@ -32666,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));
 
@@ -32685,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));
 
@@ -32704,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));
 
@@ -32723,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));
 
@@ -32742,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));
 
@@ -32761,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));
 
@@ -32780,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));
 
@@ -32799,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));
 
@@ -32818,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));
 
@@ -32845,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));
 
@@ -32871,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));
 
@@ -32892,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));
 
@@ -32913,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));
 
@@ -32937,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));
 
@@ -32962,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));
 
@@ -32984,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));
 
@@ -33006,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));
 
@@ -33028,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));
 
@@ -33050,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));
 
@@ -33071,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));
 
@@ -33092,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));
 
@@ -33116,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));
 
@@ -33335,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));
 
@@ -33363,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));
 
@@ -33390,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));
 
@@ -33415,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));
 
@@ -33440,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));
 
@@ -33462,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));
 
@@ -33487,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));
 
@@ -33509,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));
 
@@ -33531,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));
 
@@ -33553,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));
 
@@ -33962,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));
 
@@ -33986,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));
 
@@ -34005,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));
 
@@ -34024,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));
 
@@ -34043,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));
 
@@ -34062,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));
 
@@ -34081,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));
 
@@ -34100,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));
 
@@ -34119,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));
 
@@ -34138,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));
 
@@ -34157,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));
 
@@ -34176,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));
 
@@ -34195,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));
 
@@ -34214,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));
 
@@ -34233,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));
 
@@ -34260,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));
 
@@ -34286,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));
 
@@ -34307,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));
 
@@ -34328,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));
 
@@ -34352,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));
 
@@ -34377,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));
 
@@ -34399,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));
 
@@ -34421,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));
 
@@ -34443,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));
 
@@ -34465,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));
 
@@ -34486,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));
 
@@ -34507,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));
 
@@ -34531,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));
 
@@ -34750,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));
 
@@ -34778,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));
 
@@ -34805,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));
 
@@ -34830,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));
 
@@ -34855,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));
 
@@ -34877,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));
 
@@ -34902,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));
 
@@ -34924,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));
 
@@ -34946,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));
 
@@ -34968,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));
 
@@ -35377,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));
 
@@ -35401,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));
 
@@ -35420,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));
 
@@ -35439,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));
 
@@ -35458,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));
 
@@ -35477,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));
 
@@ -35496,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));
 
@@ -35515,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));
 
@@ -35534,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));
 
@@ -35553,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));
 
@@ -35572,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));
 
@@ -35591,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));
 
@@ -35610,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));
 
@@ -35629,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));
 
@@ -35648,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));
 
@@ -35675,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));
 
@@ -35701,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));
 
@@ -35722,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));
 
@@ -35743,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));
 
@@ -35767,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));
 
@@ -35792,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));
 
@@ -35814,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));
 
@@ -35836,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));
 
@@ -35858,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));
 
@@ -35880,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));
 
@@ -35901,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));
 
@@ -35922,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));
 
@@ -35946,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));
 
@@ -36165,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));
 
@@ -36193,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));
 
@@ -36220,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));
 
@@ -36245,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));
 
@@ -36270,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));
 
@@ -36292,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));
 
@@ -36317,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));
 
@@ -36339,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));
 
@@ -36361,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));
 
@@ -36383,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));
 
@@ -36792,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));
 
@@ -36816,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));
 
@@ -36835,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));
 
@@ -36854,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));
 
@@ -36873,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));
 
@@ -36892,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));
 
@@ -36911,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));
 
@@ -36930,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));
 
@@ -36949,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));
 
@@ -36968,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));
 
@@ -36987,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));
 
@@ -37006,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));
 
@@ -37025,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));
 
@@ -37044,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));
 
@@ -37063,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));
 
@@ -37090,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));
 
@@ -37116,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));
 
@@ -37137,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));
 
@@ -37158,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));
 
@@ -37182,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));
 
@@ -37207,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));
 
@@ -37229,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));
 
@@ -37251,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));
 
@@ -37273,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));
 
@@ -37295,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));
 
@@ -37316,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));
 
@@ -37337,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));
 
@@ -37361,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));
 
@@ -37580,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));
 
@@ -37608,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));
 
@@ -37635,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));
 
@@ -37660,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));
 
@@ -37685,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));
 
@@ -37707,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));
 
@@ -37732,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));
 
@@ -37754,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));
 
@@ -37776,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));
 
@@ -37798,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));
 
@@ -38207,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));
 
@@ -38231,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));
 
@@ -38250,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));
 
@@ -38269,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));
 
@@ -38288,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));
 
@@ -38307,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));
 
@@ -38326,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));
 
@@ -38345,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));
 
@@ -38364,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));
 
@@ -38383,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));
 
@@ -38402,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));
 
@@ -38421,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));
 
@@ -38440,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));
 
@@ -38459,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));
 
@@ -38478,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));
 
@@ -38505,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));
 
@@ -38531,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));
 
@@ -38552,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));
 
@@ -38573,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));
 
@@ -38597,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));
 
@@ -38622,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));
 
@@ -38644,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));
 
@@ -38666,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));
 
@@ -38688,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));
 
@@ -38710,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));
 
@@ -38731,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));
 
@@ -38752,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));
 
@@ -38776,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));
 
@@ -38995,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));
 
@@ -39023,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));
 
@@ -39050,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));
 
@@ -39075,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));
 
@@ -39100,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));
 
@@ -39122,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));
 
@@ -39147,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));
 
@@ -39169,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));
 
@@ -39191,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));
 
@@ -39213,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));
 
@@ -39622,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));
 
@@ -39646,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));
 
@@ -39665,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));
 
@@ -39684,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));
 
@@ -39703,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));
 
@@ -39722,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));
 
@@ -39741,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));
 
@@ -39760,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));
 
@@ -39779,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));
 
@@ -39798,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));
 
@@ -39817,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));
 
@@ -39836,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));
 
@@ -39855,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));
 
@@ -39874,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));
 
@@ -39893,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));
 
@@ -39920,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));
 
@@ -39946,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));
 
@@ -39967,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));
 
@@ -39988,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));
 
@@ -40012,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));
 
@@ -40037,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));
 
@@ -40059,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));
 
@@ -40081,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));
 
@@ -40103,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));
 
@@ -40125,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));
 
@@ -40146,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));
 
@@ -40167,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));
 
@@ -40191,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));
 
@@ -40410,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));
 
@@ -40438,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));
 
@@ -40465,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));
 
@@ -40490,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));
 
@@ -40515,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));
 
@@ -40537,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));
 
@@ -40562,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));
 
@@ -40584,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));
 
@@ -40606,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));
 
@@ -40628,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));
 
@@ -40643,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);
@@ -40657,7 +44558,7 @@ class TestIcdManagementCluster : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~TestIcdManagementCluster()
+    ~Test_TC_OPCREDS_1_2()
     {
     }
 
@@ -40667,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;
         }
@@ -40684,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, 300UL));
-            }
-
-            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;
         }
 
@@ -41685,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));
 
@@ -41709,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));
 
@@ -41733,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));
 
@@ -41765,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));
 
@@ -41796,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));
 
@@ -41824,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));
 
@@ -42125,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"));
@@ -42149,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));
 
@@ -42173,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));
 
@@ -42211,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));
 
@@ -42248,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));
 
@@ -42269,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));
 
@@ -42290,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));
 
@@ -42311,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));
 
@@ -42332,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));
 
@@ -42353,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));
 
@@ -42374,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));
 
@@ -42395,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));
 
@@ -42416,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));
 
@@ -42435,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));
 
@@ -42726,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));
 
@@ -42750,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));
 
@@ -42773,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));
 
@@ -42796,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));
 
@@ -42819,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));
 
@@ -42842,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));
 
@@ -42868,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));
 
@@ -42893,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));
 
@@ -42919,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));
 
@@ -42940,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));
 
@@ -42961,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));
 
@@ -42985,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));
 
@@ -43006,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));
 
@@ -43027,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));
 
@@ -43050,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));
 
@@ -43073,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));
 
@@ -43267,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));
 
@@ -43291,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));
 
@@ -43310,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));
 
@@ -43329,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));
 
@@ -43359,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));
 
@@ -43388,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));
 
@@ -43409,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));
 
@@ -43433,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));
 
@@ -43602,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));
 
@@ -43626,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));
 
@@ -43650,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));
 
@@ -43676,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));
 
@@ -43701,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));
 
@@ -43726,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));
 
@@ -44036,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));
 
@@ -44060,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));
 
@@ -44084,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));
 
@@ -44103,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));
 
@@ -44122,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));
 
@@ -44148,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));
 
@@ -44173,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));
 
@@ -44194,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));
 
@@ -44215,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));
 
@@ -44236,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));
 
@@ -44257,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));
 
@@ -44278,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));
 
@@ -44299,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));
 
@@ -44320,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));
 
@@ -44341,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));
 
@@ -44362,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));
 
@@ -44383,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));
 
@@ -44407,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));
 
@@ -44665,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));
 
@@ -44688,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));
 
@@ -44711,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));
 
@@ -44768,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));
 
@@ -44800,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));
 
@@ -44824,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));
 
@@ -44848,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));
 
@@ -44872,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));
 
@@ -44895,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));
 
@@ -45232,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));
 
@@ -45257,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));
 
@@ -45282,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));
 
@@ -45307,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));
 
@@ -45332,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));
 
@@ -45357,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));
 
@@ -45382,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));
 
@@ -45407,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));
 
@@ -45432,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));
 
@@ -45457,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));
 
@@ -45483,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));
 
@@ -45506,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));
 
@@ -45529,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));
 
@@ -45552,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));
 
@@ -45575,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));
 
@@ -45598,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));
 
@@ -45636,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));
 
@@ -45656,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));
 
@@ -45676,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));
 
@@ -45852,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));
 
@@ -45876,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));
 
@@ -45900,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));
 
@@ -45929,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));
 
@@ -45957,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));
 
@@ -45978,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));
 
@@ -46002,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));
 
@@ -46171,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));
 
@@ -46195,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));
 
@@ -46219,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));
 
@@ -46246,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));
 
@@ -46272,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));
 
@@ -46296,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));
 
@@ -46594,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));
 
@@ -46618,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));
 
@@ -46642,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));
 
@@ -46661,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));
 
@@ -46680,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));
 
@@ -46699,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));
 
@@ -46718,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));
 
@@ -46737,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));
 
@@ -46756,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));
 
@@ -46786,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));
 
@@ -46815,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));
 
@@ -46838,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));
 
@@ -46860,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));
 
@@ -46882,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));
 
@@ -46903,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));
 
@@ -46927,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));
 
@@ -46948,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));
 
@@ -47100,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));
 
@@ -47122,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));
 
@@ -47144,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));
 
@@ -47169,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));
 
@@ -47309,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));
 
@@ -47334,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));
 
@@ -47359,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));
 
@@ -47487,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));
 
@@ -47506,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));
 
@@ -47631,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));
 
@@ -47650,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));
 
@@ -47912,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));
 
@@ -47938,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));
 
@@ -47964,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));
 
@@ -47990,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));
 
@@ -48014,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));
 
@@ -48039,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));
 
@@ -48065,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));
 
@@ -48088,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));
 
@@ -48115,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));
 
@@ -48141,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));
 
@@ -48304,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));
 
@@ -48329,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));
 
@@ -48355,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));
 
@@ -48383,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));
 
@@ -48559,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));
 
@@ -48585,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));
 
@@ -48611,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));
 
@@ -48637,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));
 
@@ -48805,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));
 
@@ -48829,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));
 
@@ -48853,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));
 
@@ -48884,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));
 
@@ -48914,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));
 
@@ -48937,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));
 
@@ -49121,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));
 
@@ -49143,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));
 
@@ -49161,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));
 
@@ -49184,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));
 
@@ -49205,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));
 
@@ -49226,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));
 
@@ -49244,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));
 
@@ -49503,7 +53186,11 @@ 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));
 
@@ -49527,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));
 
@@ -49551,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));
 
@@ -49580,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));
 
@@ -49608,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: Validate presence of mandatory 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));
 
@@ -49629,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));
 
@@ -49650,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));
 
@@ -49671,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));
 
@@ -49692,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));
 
@@ -49713,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));
 
@@ -49734,7 +53457,11 @@ 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));
 
@@ -49756,7 +53483,11 @@ 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));
 
@@ -49941,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));
 
@@ -49965,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));
 
@@ -49989,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));
 
@@ -50008,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));
 
@@ -50038,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));
 
@@ -50067,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));
 
@@ -50091,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));
 
@@ -50561,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));
 
@@ -50603,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));
 
@@ -50625,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));
 
@@ -50674,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));
 
@@ -50710,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));
 
@@ -50747,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();
@@ -50783,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();
@@ -50820,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();
@@ -50856,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();
@@ -50892,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();
@@ -50929,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();
@@ -50964,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();
@@ -51000,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();
@@ -51036,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();
@@ -51073,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();
@@ -51110,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();
@@ -51147,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();
@@ -51184,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();
@@ -51221,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();
@@ -51258,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();
@@ -51295,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();
@@ -51332,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();
@@ -51369,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();
@@ -51406,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();
@@ -51443,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));
 
@@ -51465,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));
 
@@ -51502,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();
@@ -51523,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));
 
@@ -51571,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();
@@ -51602,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();
@@ -51623,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();
@@ -51633,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);
@@ -51647,7 +55530,7 @@ class Test_TC_ICDM_1_1 : public TestCommandBridge {
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
 
-    ~Test_TC_ICDM_1_1()
+    ~TestIcdManagementCluster()
     {
     }
 
@@ -51657,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;
         }
@@ -51674,116 +55557,1106 @@ 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 IdleModeDuration\n");
+            err = TestReadIdleModeDuration_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 ActiveModeDuration\n");
+            err = TestReadActiveModeDuration_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 ActiveModeThreshold\n");
+            err = TestReadActiveModeThreshold_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 ICDCounter\n");
+            err = TestReadICDCounter_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 ClientsSupportedPerFabric\n");
+            err = TestReadClientsSupportedPerFabric_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 : Unregister 1.0\n");
+            err = TestUnregister10_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 2.0\n");
+            err = TestUnregister20_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 3.0\n");
+            err = TestUnregister30_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 : Read RegisteredClients\n");
+            err = TestReadRegisteredClients_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 : Register 1.0 (key too short)\n");
+            err = TestRegister10KeyTooShort_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 long)\n");
+            err = TestRegister10KeyTooLong_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.1\n");
+            err = TestRegister11_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 2.1\n");
+            err = TestRegister21_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 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) {
+            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_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) {
+            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_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) {
+            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_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) {
+            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_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) {
+            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_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) {
+                                                           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_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) {
+                                                           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_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 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_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) {
+            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_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) {
+                                                         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_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) {
+                                                         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_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) {
+                                                         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_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) {
+                                                         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_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) {
+                                                         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_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) {
+            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_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) {
+                                                         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_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) {
+            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_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) {
+                                                         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_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) {
+            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_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) {
+                                                           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_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) {
+            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_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) {
+                                                           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_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) {
+            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_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) {
+                                                           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_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) {
+                                                           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;
         }
 
@@ -51874,7 +56747,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));
 
@@ -51898,15 +56775,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();
         }];
@@ -51922,7 +56798,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));
 
@@ -51946,7 +56826,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));
 
@@ -51975,7 +56859,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));
 
@@ -52003,7 +56891,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));
 
@@ -52024,7 +56916,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));
 
@@ -52045,7 +56941,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));
 
@@ -52066,7 +56966,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));
 
@@ -52090,7 +56994,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));
 
@@ -52112,7 +57020,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));
 
@@ -52133,7 +57045,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));
 
@@ -52157,7 +57073,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));
 
@@ -52334,7 +57254,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));
 
@@ -52358,7 +57282,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));
 
@@ -52382,7 +57310,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));
 
@@ -52409,7 +57341,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));
 
@@ -52436,7 +57372,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));
 
@@ -52457,7 +57397,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));
 
@@ -52478,7 +57422,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));
 
@@ -52608,7 +57556,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));
 
@@ -52630,7 +57582,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));
 
@@ -52861,7 +57817,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));
 
@@ -52900,7 +57860,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));
 
@@ -52918,7 +57882,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));
 
@@ -52947,7 +57915,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));
 
@@ -52972,7 +57944,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));
 
@@ -52990,7 +57966,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));
 
@@ -53016,7 +57996,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));
 
@@ -53042,7 +58026,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));
 
@@ -53383,7 +58371,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));
 
@@ -53417,7 +58409,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));
 
@@ -53451,7 +58447,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));
 
@@ -53485,7 +58485,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));
 
@@ -53519,7 +58523,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));
 
@@ -53553,7 +58561,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));
 
@@ -53587,7 +58599,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));
 
@@ -53621,7 +58637,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));
 
@@ -53655,7 +58675,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));
 
@@ -53689,7 +58713,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));
 
@@ -53884,7 +58912,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));
 
@@ -53908,7 +58940,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));
 
@@ -53932,7 +58968,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));
 
@@ -53961,7 +59001,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));
 
@@ -53989,7 +59033,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));
 
@@ -54010,7 +59058,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));
 
@@ -54031,7 +59083,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));
 
@@ -54055,7 +59111,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));
 
@@ -54218,7 +59278,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));
 
@@ -54243,7 +59307,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));
 
@@ -54268,7 +59336,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));
 
@@ -54293,7 +59365,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));
 
@@ -54315,7 +59391,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));
 
@@ -54505,7 +59585,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));
 
@@ -54532,7 +59616,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));
 
@@ -54576,7 +59664,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));
 
@@ -54618,7 +59710,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));
 
@@ -54923,7 +60019,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));
 
@@ -54947,7 +60047,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));
 
@@ -54971,7 +60075,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));
 
@@ -54990,7 +60098,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));
 
@@ -55009,7 +60121,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));
 
@@ -55028,7 +60144,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));
 
@@ -55057,7 +60177,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));
 
@@ -55085,7 +60209,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));
 
@@ -55107,7 +60235,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));
 
@@ -55130,7 +60262,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));
 
@@ -55151,7 +60287,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));
 
@@ -55172,7 +60312,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));
 
@@ -55193,7 +60337,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));
 
@@ -55214,7 +60362,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));
 
@@ -55235,7 +60387,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));
 
@@ -55256,7 +60412,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));
 
@@ -55284,7 +60444,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));
 
@@ -55305,7 +60469,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));
 
@@ -55634,7 +60802,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));
 
@@ -55662,7 +60834,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));
 
@@ -55685,7 +60861,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));
 
@@ -55714,7 +60894,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));
 
@@ -55740,7 +60924,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));
 
@@ -55770,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 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));
 
@@ -55795,7 +60987,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));
 
@@ -55820,7 +61016,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));
 
@@ -55845,7 +61045,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));
 
@@ -55868,7 +61072,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));
 
@@ -55894,7 +61102,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));
 
@@ -55919,7 +61131,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));
 
@@ -55941,7 +61157,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));
 
@@ -55963,7 +61183,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));
 
@@ -55988,7 +61212,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));
 
@@ -56013,7 +61241,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));
 
@@ -56038,7 +61270,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));
 
@@ -56063,7 +61299,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));
 
@@ -56088,7 +61328,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));
 
@@ -56107,7 +61351,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));
 
@@ -56438,7 +61686,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));
 
@@ -56465,7 +61717,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));
 
@@ -56483,7 +61739,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));
 
@@ -56510,7 +61770,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));
 
@@ -56540,7 +61804,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));
 
@@ -56558,7 +61826,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));
 
@@ -56588,7 +61860,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));
 
@@ -56618,7 +61894,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));
 
@@ -56636,7 +61916,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));
 
@@ -56666,7 +61950,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));
 
@@ -56696,7 +61984,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));
 
@@ -56714,7 +62006,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));
 
@@ -56744,7 +62040,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));
 
@@ -56774,7 +62074,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));
 
@@ -56792,7 +62096,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));
 
@@ -56822,7 +62130,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));
 
@@ -56852,7 +62164,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));
 
@@ -56870,7 +62186,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));
 
@@ -56902,7 +62222,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));
 
@@ -57495,7 +62819,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));
 
@@ -57513,7 +62841,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));
 
@@ -57539,7 +62871,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));
 
@@ -57560,7 +62896,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));
 
@@ -57580,7 +62920,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));
 
@@ -57599,7 +62943,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));
 
@@ -57627,7 +62975,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));
 
@@ -57645,7 +62997,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));
 
@@ -57668,7 +63024,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));
 
@@ -57693,7 +63053,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));
 
@@ -57721,7 +63085,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));
 
@@ -57739,7 +63107,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));
 
@@ -57773,7 +63145,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));
 
@@ -57799,7 +63175,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));
 
@@ -57831,7 +63211,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));
 
@@ -57863,7 +63247,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));
 
@@ -57895,7 +63283,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));
 
@@ -57919,7 +63311,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));
 
@@ -57946,7 +63342,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));
 
@@ -57964,7 +63364,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));
 
@@ -57988,7 +63392,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));
 
@@ -58016,7 +63424,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));
 
@@ -58034,7 +63446,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));
 
@@ -58059,7 +63475,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));
 
@@ -58087,7 +63507,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));
 
@@ -58105,7 +63529,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));
 
@@ -58139,7 +63567,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));
 
@@ -58157,7 +63589,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));
 
@@ -58191,7 +63627,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));
 
@@ -58209,7 +63649,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));
 
@@ -58236,7 +63680,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));
 
@@ -58254,7 +63702,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));
 
@@ -58278,7 +63730,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));
 
@@ -58306,7 +63762,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));
 
@@ -58324,7 +63784,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));
 
@@ -58349,7 +63813,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));
 
@@ -58377,7 +63845,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));
 
@@ -58395,7 +63867,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));
 
@@ -58429,7 +63905,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));
 
@@ -58447,7 +63927,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));
 
@@ -58481,7 +63965,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));
 
@@ -58499,7 +63987,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));
 
@@ -58863,7 +64355,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));
 
@@ -58881,7 +64377,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));
 
@@ -58907,7 +64407,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));
 
@@ -58928,7 +64432,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));
 
@@ -58946,7 +64454,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));
 
@@ -58969,7 +64481,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));
 
@@ -58997,7 +64513,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));
 
@@ -59015,7 +64535,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));
 
@@ -59039,7 +64563,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));
 
@@ -59073,7 +64601,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));
 
@@ -59098,7 +64630,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));
 
@@ -59126,7 +64662,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));
 
@@ -59144,7 +64684,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));
 
@@ -59178,7 +64722,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));
 
@@ -59204,7 +64752,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));
 
@@ -59236,7 +64788,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));
 
@@ -59268,7 +64824,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));
 
@@ -59300,7 +64860,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));
 
@@ -59325,7 +64889,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));
 
@@ -59343,7 +64911,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));
 
@@ -59677,7 +65249,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));
 
@@ -59695,7 +65271,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));
 
@@ -59721,7 +65301,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));
 
@@ -59742,7 +65326,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));
 
@@ -59761,7 +65349,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));
 
@@ -59791,7 +65383,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));
 
@@ -59809,7 +65405,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));
 
@@ -59833,7 +65433,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));
 
@@ -59861,7 +65465,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));
 
@@ -59879,7 +65487,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));
 
@@ -59915,7 +65527,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));
 
@@ -59941,7 +65557,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));
 
@@ -59973,7 +65593,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));
 
@@ -60005,7 +65629,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));
 
@@ -60037,7 +65665,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));
 
@@ -60061,7 +65693,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));
 
@@ -60086,7 +65722,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));
 
@@ -60104,7 +65744,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));
 
@@ -60393,7 +66037,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));
 
@@ -60414,7 +66062,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));
 
@@ -60433,7 +66085,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));
 
@@ -60461,7 +66117,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));
 
@@ -60479,7 +66139,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));
 
@@ -60513,7 +66177,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));
 
@@ -60545,7 +66213,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));
 
@@ -60573,7 +66245,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));
 
@@ -60607,7 +66283,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));
 
@@ -60639,7 +66319,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));
 
@@ -60667,7 +66351,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));
 
@@ -60692,7 +66380,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));
 
@@ -60710,7 +66402,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));
 
@@ -61025,7 +66721,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));
 
@@ -61046,7 +66746,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));
 
@@ -61065,7 +66769,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));
 
@@ -61084,7 +66792,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));
 
@@ -61110,7 +66822,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));
 
@@ -61144,7 +66860,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));
 
@@ -61170,7 +66890,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));
 
@@ -61195,7 +66919,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));
 
@@ -61221,7 +66949,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));
 
@@ -61247,7 +66979,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));
 
@@ -61272,7 +67008,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));
 
@@ -61297,7 +67037,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));
 
@@ -61323,7 +67067,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));
 
@@ -61356,7 +67104,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));
 
@@ -61389,7 +67141,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));
 
@@ -61557,7 +67313,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));
 
@@ -61581,7 +67341,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));
 
@@ -61605,7 +67369,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));
 
@@ -61633,7 +67401,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));
 
@@ -61660,7 +67432,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));
 
@@ -61684,7 +67460,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));
 
@@ -61879,7 +67659,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));
 
@@ -61903,7 +67687,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));
 
@@ -61927,7 +67715,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));
 
@@ -61946,7 +67738,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));
 
@@ -61972,7 +67768,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));
 
@@ -61997,7 +67797,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));
 
@@ -62018,7 +67822,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));
 
@@ -62042,7 +67850,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));
 
@@ -62238,7 +68050,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));
 
@@ -62260,7 +68076,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));
 
@@ -62278,7 +68098,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));
 
@@ -62304,7 +68128,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));
 
@@ -62322,7 +68150,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));
 
@@ -62348,7 +68180,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));
 
@@ -62366,7 +68202,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));
 
@@ -62392,7 +68232,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();
@@ -62576,7 +68420,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));
 
@@ -62600,7 +68448,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));
 
@@ -62622,7 +68474,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));
 
@@ -62649,7 +68505,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));
 
@@ -62675,7 +68535,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));
 
@@ -62696,7 +68560,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));
 
@@ -62717,7 +68585,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));
 
@@ -62741,7 +68613,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));
 
@@ -62970,7 +68846,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));
 
@@ -62992,7 +68872,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));
 
@@ -63010,7 +68894,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));
 
@@ -63036,7 +68924,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));
 
@@ -63054,7 +68946,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));
 
@@ -63077,7 +68973,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));
 
@@ -63098,7 +68998,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));
 
@@ -63140,7 +69044,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();
@@ -63160,7 +69068,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();
@@ -63359,7 +69271,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));
 
@@ -63383,7 +69299,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));
 
@@ -63402,7 +69322,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));
 
@@ -63426,7 +69350,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));
 
@@ -63454,7 +69382,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));
 
@@ -63481,7 +69413,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));
 
@@ -63502,7 +69438,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));
 
@@ -63523,7 +69463,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));
 
@@ -63544,7 +69488,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));
 
@@ -63798,7 +69746,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));
 
@@ -63819,7 +69771,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));
 
@@ -63848,7 +69804,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));
 
@@ -63882,7 +69842,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));
 
@@ -63917,7 +69881,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));
 
@@ -63955,7 +69923,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));
 
@@ -63983,7 +69955,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));
 
@@ -64006,7 +69982,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));
 
@@ -64032,7 +70012,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));
 
@@ -64055,7 +70039,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));
 
@@ -64271,7 +70259,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));
 
@@ -64295,7 +70287,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));
 
@@ -64319,7 +70315,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));
 
@@ -64338,7 +70338,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));
 
@@ -64357,7 +70361,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));
 
@@ -64383,7 +70391,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));
 
@@ -64408,7 +70420,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));
 
@@ -64430,7 +70446,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));
 
@@ -64452,7 +70472,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));
 
@@ -64476,7 +70500,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));
 
@@ -64661,7 +70689,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));
 
@@ -64681,7 +70713,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));
 
@@ -64717,7 +70753,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));
 
@@ -64743,7 +70783,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));
 
@@ -64773,7 +70817,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();
@@ -64951,7 +70999,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));
 
@@ -64973,7 +71025,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));
 
@@ -64995,7 +71051,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));
 
@@ -65021,7 +71081,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));
 
@@ -65056,7 +71120,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();
@@ -65218,7 +71286,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));
 
@@ -65242,7 +71314,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));
 
@@ -65266,7 +71342,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));
 
@@ -65296,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));
 
@@ -65325,7 +71409,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));
 
@@ -65350,7 +71438,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));
 
@@ -65556,7 +71648,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));
 
@@ -65580,7 +71676,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));
 
@@ -65604,7 +71704,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));
 
@@ -65623,7 +71727,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));
 
@@ -65642,7 +71750,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));
 
@@ -65661,7 +71773,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));
 
@@ -65687,7 +71803,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));
 
@@ -65712,7 +71832,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));
 
@@ -65733,7 +71857,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));
 
@@ -65936,7 +72064,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));
 
@@ -65960,7 +72092,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));
 
@@ -65984,7 +72120,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));
 
@@ -66008,7 +72148,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));
 
@@ -66034,7 +72178,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));
 
@@ -66059,7 +72207,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));
 
@@ -66080,7 +72232,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));
 
@@ -66101,7 +72257,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));
 
@@ -66124,7 +72284,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));
 
@@ -66327,7 +72491,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));
 
@@ -66351,7 +72519,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));
 
@@ -66375,7 +72547,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));
 
@@ -66394,7 +72570,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));
 
@@ -66420,7 +72600,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));
 
@@ -66445,7 +72629,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));
 
@@ -66466,7 +72654,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));
 
@@ -66487,7 +72679,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));
 
@@ -66511,7 +72707,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));
 
@@ -66691,7 +72891,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));
 
@@ -66715,7 +72919,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));
 
@@ -66739,7 +72947,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));
 
@@ -66765,7 +72977,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));
 
@@ -66790,7 +73006,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));
 
@@ -66811,7 +73031,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));
 
@@ -66835,7 +73059,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));
 
@@ -67104,7 +73332,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));
 
@@ -67128,7 +73360,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));
 
@@ -67152,7 +73388,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));
 
@@ -67171,7 +73411,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));
 
@@ -67190,7 +73434,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));
 
@@ -67216,7 +73464,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));
 
@@ -67241,7 +73493,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));
 
@@ -67262,7 +73518,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));
 
@@ -67283,7 +73543,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));
 
@@ -67304,7 +73568,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));
 
@@ -67325,7 +73593,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));
 
@@ -67346,7 +73618,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));
 
@@ -67367,7 +73643,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));
 
@@ -67391,7 +73671,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));
 
@@ -67737,7 +74021,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));
 
@@ -67761,7 +74049,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));
 
@@ -67785,7 +74077,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));
 
@@ -67804,7 +74100,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));
 
@@ -67823,7 +74123,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));
 
@@ -67850,7 +74154,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));
 
@@ -67876,7 +74184,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));
 
@@ -67897,7 +74209,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));
 
@@ -67918,7 +74234,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));
 
@@ -67939,7 +74259,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));
 
@@ -67960,7 +74284,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));
 
@@ -67981,7 +74309,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));
 
@@ -68002,7 +74334,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));
 
@@ -68025,7 +74361,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));
 
@@ -68046,7 +74386,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));
 
@@ -68067,7 +74411,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));
 
@@ -68088,7 +74436,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));
 
@@ -68109,7 +74461,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));
 
@@ -68130,7 +74486,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));
 
@@ -68151,7 +74511,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));
 
@@ -68172,7 +74536,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));
 
@@ -68193,7 +74561,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));
 
@@ -68374,7 +74746,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));
 
@@ -68398,7 +74774,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));
 
@@ -68417,7 +74797,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));
 
@@ -68436,7 +74820,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));
 
@@ -68464,7 +74852,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));
 
@@ -68491,7 +74883,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));
 
@@ -68512,7 +74908,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));
 
@@ -68692,7 +75092,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));
 
@@ -68716,7 +75120,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));
 
@@ -68740,7 +75148,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));
 
@@ -68767,7 +75179,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));
 
@@ -68793,7 +75209,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));
 
@@ -68814,7 +75234,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));
 
@@ -68835,7 +75259,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));
 
@@ -69034,7 +75462,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));
 
@@ -69058,7 +75490,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));
 
@@ -69082,7 +75518,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));
 
@@ -69113,7 +75553,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));
 
@@ -69143,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 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));
 
@@ -69164,7 +75612,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));
 
@@ -69185,7 +75637,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));
 
@@ -69206,7 +75662,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));
 
@@ -69230,7 +75690,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));
 
@@ -69462,7 +75926,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));
 
@@ -69486,7 +75954,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));
 
@@ -69510,7 +75982,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));
 
@@ -69529,7 +76005,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));
 
@@ -69548,7 +76028,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));
 
@@ -69574,7 +76058,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));
 
@@ -69599,7 +76087,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));
 
@@ -69620,7 +76112,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));
 
@@ -69641,7 +76137,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));
 
@@ -69662,7 +76162,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));
 
@@ -69683,7 +76187,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));
 
@@ -69849,7 +76357,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));
 
@@ -69873,7 +76385,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));
 
@@ -69897,7 +76413,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));
 
@@ -69923,7 +76443,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));
 
@@ -69948,7 +76472,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));
 
@@ -69971,7 +76499,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));
 
@@ -70088,7 +76620,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));
 
@@ -70216,7 +76752,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));
 
@@ -70243,7 +76783,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));
 
@@ -70453,7 +76997,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));
 
@@ -70480,7 +77028,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));
 
@@ -70507,7 +77059,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));
 
@@ -70534,7 +77090,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));
 
@@ -70561,7 +77121,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));
 
@@ -70588,7 +77152,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));
 
@@ -70615,7 +77183,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));
 
@@ -70642,7 +77214,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));
 
@@ -70669,7 +77245,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));
 
@@ -70787,7 +77367,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));
 
@@ -70900,7 +77484,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));
 
@@ -71013,7 +77601,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));
 
@@ -71150,7 +77742,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));
 
@@ -71171,7 +77767,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));
 
@@ -71189,7 +77789,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));
 
@@ -71329,7 +77933,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));
 
@@ -71348,7 +77956,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));
 
@@ -71367,7 +77979,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));
 
@@ -71504,7 +78120,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));
 
@@ -71527,7 +78147,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));
 
@@ -71650,7 +78274,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));
 
@@ -71800,7 +78428,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));
 
@@ -71823,7 +78455,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));
 
@@ -71851,7 +78487,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));
 
@@ -72034,7 +78674,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));
 
@@ -72052,7 +78696,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));
 
@@ -72071,7 +78719,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));
 
@@ -72100,7 +78752,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));
 
@@ -72128,7 +78784,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));
 
@@ -72363,7 +79023,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));
 
@@ -72386,7 +79050,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));
 
@@ -72410,7 +79078,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));
 
@@ -72443,7 +79115,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));
 
@@ -72467,7 +79143,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));
 
@@ -72500,7 +79180,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));
 
@@ -72524,7 +79208,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));
 
@@ -72557,7 +79245,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));
 
@@ -72852,7 +79544,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));
 
@@ -72875,7 +79571,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));
 
@@ -72899,7 +79599,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));
 
@@ -72932,7 +79636,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));
 
@@ -72956,7 +79664,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));
 
@@ -72990,7 +79702,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));
 
@@ -73024,7 +79740,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));
 
@@ -73061,7 +79781,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));
 
@@ -73094,7 +79818,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));
 
@@ -73123,7 +79851,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));
 
@@ -73156,7 +79888,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));
 
@@ -73378,7 +80114,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));
 
@@ -73405,7 +80145,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));
 
@@ -73438,7 +80182,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));
 
@@ -73463,7 +80211,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));
 
@@ -73486,7 +80238,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));
 
@@ -73511,7 +80267,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));
 
@@ -73536,7 +80296,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));
 
@@ -73565,7 +80329,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));
 
@@ -73925,7 +80693,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));
 
@@ -73948,7 +80720,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));
 
@@ -73971,7 +80747,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));
 
@@ -73995,7 +80775,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));
 
@@ -74028,7 +80812,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));
 
@@ -74051,7 +80839,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));
 
@@ -74075,7 +80867,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));
 
@@ -74108,7 +80904,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));
 
@@ -74132,7 +80932,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));
 
@@ -74165,7 +80969,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));
 
@@ -74188,7 +80996,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));
 
@@ -74212,7 +81024,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));
 
@@ -74245,7 +81061,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));
 
@@ -74269,7 +81089,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));
 
@@ -74302,7 +81126,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));
 
@@ -74464,7 +81292,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));
 
@@ -74486,7 +81318,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));
 
@@ -74504,7 +81340,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));
 
@@ -74647,7 +81487,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));
 
@@ -74674,7 +81518,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));
 
@@ -74832,7 +81680,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));
 
@@ -74855,7 +81707,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));
 
@@ -74881,7 +81737,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));
 
@@ -74899,7 +81759,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));
 
@@ -75094,7 +81958,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));
 
@@ -75114,7 +81982,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));
 
@@ -75133,7 +82005,11 @@ 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));
 
@@ -75153,7 +82029,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));
 
@@ -75175,7 +82055,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));
 
@@ -75194,7 +82078,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));
 
@@ -75215,7 +82103,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));
 
@@ -75235,7 +82127,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));
 
@@ -75360,7 +82256,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));
 
@@ -75379,7 +82279,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));
 
@@ -75515,7 +82419,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));
 
@@ -75535,7 +82443,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));
 
@@ -75705,7 +82617,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));
 
@@ -75732,7 +82648,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));
 
@@ -75760,7 +82680,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));
 
@@ -75779,7 +82703,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));
 
@@ -75957,7 +82885,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));
 
@@ -76019,7 +82951,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));
 
@@ -76245,7 +83181,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));
 
@@ -76285,7 +83225,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));
 
@@ -76329,7 +83273,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));
 
@@ -76368,7 +83316,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));
 
@@ -76397,7 +83349,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));
 
@@ -76807,7 +83763,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));
 
@@ -76855,7 +83815,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));
 
@@ -76903,7 +83867,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));
 
@@ -76951,7 +83919,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));
 
@@ -76999,7 +83971,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));
 
@@ -77047,7 +84023,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));
 
@@ -77095,7 +84075,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));
 
@@ -77143,7 +84127,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));
 
@@ -77191,7 +84179,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));
 
@@ -77239,7 +84231,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));
 
@@ -77287,7 +84283,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));
 
@@ -77335,7 +84335,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));
 
@@ -77383,7 +84387,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));
 
@@ -77598,7 +84606,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));
 
@@ -77622,7 +84634,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));
 
@@ -77646,7 +84662,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));
 
@@ -77670,7 +84690,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));
 
@@ -77700,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));
 
@@ -77729,7 +84757,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));
 
@@ -77750,7 +84782,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));
 
@@ -77771,7 +84807,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));
 
@@ -77792,7 +84832,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));
 
@@ -78061,7 +85105,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));
 
@@ -78111,7 +85159,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));
 
@@ -78293,7 +85345,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));
 
@@ -78317,7 +85373,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));
 
@@ -78341,7 +85401,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));
 
@@ -78370,7 +85434,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));
 
@@ -78398,7 +85466,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));
 
@@ -78422,7 +85494,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));
 
@@ -78662,7 +85738,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));
 
@@ -78684,7 +85764,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));
 
@@ -78706,7 +85790,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));
 
@@ -78728,7 +85816,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));
 
@@ -78750,7 +85842,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));
 
@@ -78772,7 +85868,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));
 
@@ -78794,7 +85894,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));
 
@@ -78816,7 +85920,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));
 
@@ -78838,7 +85946,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));
 
@@ -78860,7 +85972,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));
 
@@ -78882,7 +85998,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));
 
@@ -78904,7 +86024,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));
 
@@ -79032,7 +86156,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));
 
@@ -79054,7 +86182,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));
 
@@ -79269,7 +86401,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));
 
@@ -79291,7 +86427,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));
 
@@ -79315,7 +86455,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));
 
@@ -79334,7 +86478,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));
 
@@ -79353,7 +86501,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));
 
@@ -79380,7 +86532,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));
 
@@ -79406,7 +86562,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));
 
@@ -79430,7 +86590,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));
 
@@ -79453,7 +86617,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));
 
@@ -79476,7 +86644,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));
 
@@ -79639,7 +86811,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));
 
@@ -79658,7 +86834,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));
 
@@ -79677,7 +86857,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));
 
@@ -79699,7 +86883,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));
 
@@ -79721,7 +86909,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));
 
@@ -80063,7 +87255,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));
 
@@ -80081,7 +87277,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));
 
@@ -80105,7 +87305,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));
 
@@ -80123,7 +87327,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));
 
@@ -80147,7 +87355,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));
 
@@ -80165,7 +87377,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));
 
@@ -80189,7 +87405,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));
 
@@ -80207,7 +87427,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));
 
@@ -80231,7 +87455,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));
 
@@ -80249,7 +87477,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));
 
@@ -80273,7 +87505,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));
 
@@ -80299,7 +87535,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));
 
@@ -80323,7 +87563,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));
 
@@ -80349,7 +87593,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));
 
@@ -80382,7 +87630,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));
 
@@ -80415,7 +87667,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));
 
@@ -80439,7 +87695,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));
 
@@ -80457,7 +87717,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));
 
@@ -80882,7 +88146,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));
 
@@ -80903,7 +88171,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));
 
@@ -80946,7 +88218,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));
 
@@ -80972,7 +88248,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));
 
@@ -81015,7 +88295,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));
 
@@ -81041,7 +88325,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));
 
@@ -81084,7 +88372,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));
 
@@ -81132,7 +88424,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));
 
@@ -81157,7 +88453,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));
 
@@ -81200,7 +88500,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));
 
@@ -81224,7 +88528,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));
 
@@ -81242,7 +88550,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));
 
@@ -81290,7 +88602,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));
 
@@ -81532,7 +88848,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));
 
@@ -81556,7 +88876,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));
 
@@ -81580,7 +88904,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));
 
@@ -81611,7 +88939,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));
 
@@ -81641,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 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));
 
@@ -81662,7 +88998,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));
 
@@ -81684,7 +89024,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));
 
@@ -81705,7 +89049,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));
 
@@ -81727,7 +89075,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));
 
@@ -81749,7 +89101,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));
 
@@ -81773,7 +89129,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));
 
@@ -82064,7 +89424,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));
 
@@ -82088,7 +89452,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));
 
@@ -82112,7 +89480,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));
 
@@ -82131,7 +89503,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));
 
@@ -82150,7 +89526,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));
 
@@ -82169,7 +89549,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));
 
@@ -82188,7 +89572,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));
 
@@ -82218,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));
 
@@ -82247,7 +89639,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));
 
@@ -82268,7 +89664,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));
 
@@ -82291,7 +89691,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));
 
@@ -82313,7 +89717,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));
 
@@ -82335,7 +89743,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));
 
@@ -82359,7 +89771,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));
 
@@ -82819,7 +90235,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));
 
@@ -82841,7 +90261,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));
 
@@ -82863,7 +90287,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));
 
@@ -82883,7 +90311,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));
 
@@ -82908,7 +90340,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));
 
@@ -82933,7 +90369,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));
 
@@ -82955,7 +90395,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));
 
@@ -82980,7 +90424,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));
 
@@ -83002,7 +90450,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));
 
@@ -83024,7 +90476,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));
 
@@ -83043,7 +90499,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));
 
@@ -83063,7 +90523,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));
 
@@ -83088,7 +90552,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));
 
@@ -83113,7 +90581,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));
 
@@ -83138,7 +90610,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));
 
@@ -83160,7 +90636,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));
 
@@ -83179,7 +90659,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));
 
@@ -83201,7 +90685,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));
 
@@ -83220,7 +90708,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));
 
@@ -83240,7 +90732,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));
 
@@ -83260,7 +90756,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));
 
@@ -83282,7 +90782,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));
 
@@ -83302,7 +90806,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));
 
@@ -83322,7 +90830,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));
 
@@ -83344,7 +90856,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));
 
@@ -83366,7 +90882,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));
 
@@ -83388,7 +90908,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));
 
@@ -83410,7 +90934,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));
 
@@ -83435,7 +90963,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));
 
@@ -83454,7 +90986,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));
 
@@ -83479,7 +91015,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));
 
@@ -83499,7 +91039,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));
 
@@ -83744,7 +91288,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));
 
@@ -83768,7 +91316,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));
 
@@ -83792,7 +91344,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));
 
@@ -83811,7 +91367,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));
 
@@ -83840,7 +91400,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));
 
@@ -83868,7 +91432,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));
 
@@ -83889,7 +91457,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));
 
@@ -83910,7 +91482,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));
 
@@ -83931,7 +91507,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));
 
@@ -83952,7 +91532,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));
 
@@ -83973,7 +91557,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));
 
@@ -83994,7 +91582,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));
 
@@ -84018,7 +91610,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));
 
@@ -84226,7 +91822,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));
 
@@ -84255,7 +91855,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));
 
@@ -84283,7 +91887,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));
 
@@ -84308,7 +91916,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));
 
@@ -84331,7 +91943,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));
 
@@ -84360,7 +91976,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));
 
@@ -84388,7 +92008,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));
 
@@ -84413,7 +92037,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));
 
@@ -84435,7 +92063,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));
 
@@ -84582,7 +92214,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));
 
@@ -84622,7 +92258,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));
 
@@ -85233,7 +92873,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));
 
@@ -85257,7 +92901,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));
 
@@ -85281,7 +92929,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));
 
@@ -85300,7 +92952,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));
 
@@ -85319,7 +92975,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));
 
@@ -85338,7 +92998,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));
 
@@ -85357,7 +93021,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));
 
@@ -85376,7 +93044,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));
 
@@ -85395,7 +93067,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));
 
@@ -85414,7 +93090,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));
 
@@ -85447,7 +93127,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));
 
@@ -85479,7 +93163,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));
 
@@ -85500,7 +93188,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));
 
@@ -85521,7 +93213,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));
 
@@ -85542,7 +93238,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));
 
@@ -85563,7 +93263,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));
 
@@ -85584,7 +93288,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));
 
@@ -85605,7 +93313,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));
 
@@ -85626,7 +93338,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));
 
@@ -85647,7 +93363,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));
 
@@ -85668,7 +93388,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));
 
@@ -85689,7 +93413,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));
 
@@ -85710,7 +93438,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));
 
@@ -85731,7 +93463,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));
 
@@ -85752,7 +93488,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));
 
@@ -85773,7 +93513,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));
 
@@ -85794,7 +93538,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));
 
@@ -85815,7 +93563,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));
 
@@ -85839,7 +93591,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));
 
@@ -86200,7 +93956,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));
 
@@ -86225,7 +93985,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));
 
@@ -86250,7 +94014,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));
 
@@ -86275,7 +94043,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));
 
@@ -86300,7 +94072,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));
 
@@ -86325,7 +94101,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));
 
@@ -86350,7 +94130,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));
 
@@ -86375,7 +94159,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));
 
@@ -86400,7 +94188,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));
 
@@ -86425,7 +94217,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));
 
@@ -86450,7 +94246,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));
 
@@ -86475,7 +94275,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));
 
@@ -86500,7 +94304,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));
 
@@ -86525,7 +94333,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));
 
@@ -86547,7 +94359,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));
 
@@ -86569,7 +94385,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));
 
@@ -86591,7 +94411,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));
 
@@ -86616,7 +94440,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));
 
@@ -86641,7 +94469,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));
 
@@ -86666,7 +94498,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));
 
@@ -86691,7 +94527,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));
 
@@ -86716,7 +94556,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));
 
@@ -86738,7 +94582,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));
 
@@ -86935,7 +94783,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));
 
@@ -86953,7 +94805,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));
 
@@ -86979,7 +94835,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));
 
@@ -86997,7 +94857,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));
 
@@ -87023,7 +94887,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));
 
@@ -87041,7 +94909,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));
 
@@ -87067,7 +94939,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));
 
@@ -87085,7 +94961,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));
 
@@ -87349,7 +95229,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));
 
@@ -87367,7 +95251,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));
 
@@ -87393,7 +95281,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));
 
@@ -87411,7 +95303,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));
 
@@ -87437,7 +95333,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));
 
@@ -87455,7 +95355,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));
 
@@ -87481,7 +95385,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));
 
@@ -87499,7 +95407,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));
 
@@ -87525,7 +95437,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));
 
@@ -87543,7 +95459,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));
 
@@ -87569,7 +95489,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));
 
@@ -87587,7 +95511,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));
 
@@ -87613,7 +95541,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));
 
@@ -87631,7 +95563,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));
 
@@ -87873,7 +95809,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));
 
@@ -87891,7 +95831,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));
 
@@ -87918,7 +95862,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));
 
@@ -87936,7 +95884,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));
 
@@ -87963,7 +95915,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));
 
@@ -87981,7 +95937,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));
 
@@ -88008,7 +95968,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));
 
@@ -88026,7 +95990,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));
 
@@ -88053,7 +96021,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));
 
@@ -88071,7 +96043,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));
 
@@ -88098,7 +96074,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));
 
@@ -88116,7 +96096,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));
 
@@ -88285,7 +96269,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));
 
@@ -88309,7 +96297,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));
 
@@ -88333,7 +96325,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));
 
@@ -88363,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));
 
@@ -88392,7 +96392,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));
 
@@ -88416,7 +96420,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));
 
@@ -88578,7 +96586,11 @@ class Test_TC_REFALM_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeMaskWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 3:TH reads from the DUT the Mask attribute Error: %@", 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));
 
@@ -88597,7 +96609,11 @@ class Test_TC_REFALM_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeStateWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 4:TH reads from the DUT the State attribute Error: %@", 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));
 
@@ -88616,7 +96632,11 @@ class Test_TC_REFALM_2_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeSupportedWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Step 5:TH reads from the DUT the Supportedask attribute Error: %@", 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));
 
@@ -88791,7 +96811,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));
 
@@ -88815,7 +96839,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));
 
@@ -88839,7 +96867,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));
 
@@ -88868,7 +96900,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));
 
@@ -88896,7 +96932,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));
 
@@ -88917,7 +96957,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));
 
@@ -88941,7 +96985,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));
 
@@ -89166,7 +97214,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));
 
@@ -89190,7 +97242,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));
 
@@ -89214,7 +97270,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));
 
@@ -89233,7 +97293,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));
 
@@ -89261,7 +97325,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));
 
@@ -89288,7 +97356,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));
 
@@ -89309,7 +97381,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));
 
@@ -89330,7 +97406,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));
 
@@ -89351,7 +97431,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));
 
@@ -89376,7 +97460,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));
 
@@ -89602,7 +97690,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));
 
@@ -89626,7 +97718,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));
 
@@ -89650,7 +97746,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));
 
@@ -89669,7 +97769,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));
 
@@ -89697,7 +97801,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));
 
@@ -89724,7 +97832,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));
 
@@ -89745,7 +97857,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));
 
@@ -89766,7 +97882,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));
 
@@ -89787,7 +97907,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));
 
@@ -89812,7 +97936,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));
 
@@ -90056,7 +98184,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));
 
@@ -90080,7 +98212,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));
 
@@ -90104,7 +98240,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));
 
@@ -90135,7 +98275,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));
 
@@ -90165,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 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));
 
@@ -90186,7 +98334,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));
 
@@ -90208,7 +98360,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));
 
@@ -90230,7 +98386,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));
 
@@ -90251,7 +98411,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));
 
@@ -90273,7 +98437,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));
 
@@ -90297,7 +98465,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));
 
@@ -90654,7 +98826,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));
 
@@ -90678,7 +98854,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));
 
@@ -90702,7 +98882,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));
 
@@ -90726,7 +98910,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));
 
@@ -90750,7 +98938,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));
 
@@ -90774,7 +98966,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));
 
@@ -90804,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 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));
 
@@ -90825,7 +99025,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));
 
@@ -90846,7 +99050,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));
 
@@ -90867,7 +99075,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));
 
@@ -90888,7 +99100,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));
 
@@ -90909,7 +99125,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));
 
@@ -90930,7 +99150,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));
 
@@ -90951,7 +99175,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));
 
@@ -90972,7 +99200,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));
 
@@ -90996,7 +99228,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));
 
@@ -91017,7 +99253,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));
 
@@ -91268,7 +99508,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));
 
@@ -91290,7 +99534,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));
 
@@ -91312,7 +99560,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));
 
@@ -91334,7 +99586,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));
 
@@ -91356,7 +99612,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));
 
@@ -91378,7 +99638,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));
 
@@ -91397,7 +99661,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));
 
@@ -91416,7 +99684,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));
 
@@ -91438,7 +99710,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));
 
@@ -91460,7 +99736,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));
 
@@ -91482,7 +99762,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));
 
@@ -91504,7 +99788,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));
 
@@ -91526,7 +99814,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));
 
@@ -91826,7 +100118,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));
 
@@ -91850,7 +100146,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));
 
@@ -91874,7 +100174,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));
 
@@ -91893,7 +100197,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));
 
@@ -91912,7 +100220,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));
 
@@ -91931,7 +100243,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));
 
@@ -91950,7 +100266,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));
 
@@ -91969,7 +100289,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));
 
@@ -91990,7 +100314,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));
 
@@ -92018,7 +100346,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));
 
@@ -92045,7 +100377,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));
 
@@ -92069,7 +100405,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));
 
@@ -92275,7 +100615,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));
 
@@ -92299,7 +100643,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));
 
@@ -92323,7 +100671,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));
 
@@ -92342,7 +100694,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));
 
@@ -92370,7 +100726,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));
 
@@ -92397,7 +100757,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));
 
@@ -92418,7 +100782,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));
 
@@ -92439,7 +100807,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));
 
@@ -92460,7 +100832,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));
 
@@ -92696,7 +101072,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));
 
@@ -92720,7 +101100,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));
 
@@ -92744,7 +101128,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));
 
@@ -92763,7 +101151,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));
 
@@ -92782,7 +101174,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));
 
@@ -92801,7 +101197,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));
 
@@ -92827,7 +101227,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));
 
@@ -92852,7 +101256,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));
 
@@ -92875,7 +101283,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));
 
@@ -92896,7 +101308,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));
 
@@ -92918,7 +101334,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));
 
@@ -92939,7 +101359,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));
 
@@ -93081,7 +101505,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));
 
@@ -93105,7 +101533,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));
 
@@ -93130,7 +101562,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));
 
@@ -93271,7 +101707,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));
 
@@ -93293,7 +101733,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));
 
@@ -93479,7 +101923,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));
 
@@ -93503,7 +101951,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));
 
@@ -93527,7 +101979,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));
 
@@ -93556,7 +102012,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));
 
@@ -93584,7 +102044,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));
 
@@ -93605,7 +102069,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));
 
@@ -93629,7 +102097,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));
 
@@ -93782,7 +102254,11 @@ 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));
 
@@ -93811,7 +102287,11 @@ 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));
 
@@ -93839,7 +102319,11 @@ 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));
 
@@ -93864,7 +102348,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));
 
@@ -94611,7 +103099,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));
 
@@ -94635,7 +103127,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));
 
@@ -94659,7 +103155,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));
 
@@ -94678,7 +103178,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));
 
@@ -94697,7 +103201,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));
 
@@ -94716,7 +103224,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));
 
@@ -94735,7 +103247,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));
 
@@ -94754,7 +103270,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));
 
@@ -94773,7 +103293,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));
 
@@ -94792,7 +103316,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));
 
@@ -94821,7 +103349,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));
 
@@ -94849,7 +103381,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));
 
@@ -94870,7 +103406,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));
 
@@ -94891,7 +103431,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));
 
@@ -94912,7 +103456,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));
 
@@ -94933,7 +103481,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));
 
@@ -94954,7 +103506,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));
 
@@ -94977,7 +103533,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));
 
@@ -95000,7 +103560,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));
 
@@ -95023,7 +103587,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));
 
@@ -95046,7 +103614,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));
 
@@ -95067,7 +103639,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));
 
@@ -95088,7 +103664,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));
 
@@ -95109,7 +103689,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));
 
@@ -95130,7 +103714,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));
 
@@ -95151,7 +103739,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));
 
@@ -95172,7 +103764,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));
 
@@ -95193,7 +103789,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));
 
@@ -95214,7 +103814,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));
 
@@ -95235,7 +103839,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));
 
@@ -95256,7 +103864,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));
 
@@ -95277,7 +103889,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));
 
@@ -95298,7 +103914,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));
 
@@ -95319,7 +103939,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));
 
@@ -95340,7 +103964,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));
 
@@ -95361,7 +103989,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));
 
@@ -95382,7 +104014,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));
 
@@ -95403,7 +104039,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));
 
@@ -95424,7 +104064,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));
 
@@ -95445,7 +104089,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));
 
@@ -95466,7 +104114,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));
 
@@ -95487,7 +104139,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));
 
@@ -95508,7 +104164,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));
 
@@ -95529,7 +104189,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));
 
@@ -95550,7 +104214,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));
 
@@ -95571,7 +104239,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));
 
@@ -95592,7 +104264,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));
 
@@ -95613,7 +104289,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));
 
@@ -95634,7 +104314,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));
 
@@ -95655,7 +104339,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));
 
@@ -95676,7 +104364,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));
 
@@ -95697,7 +104389,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));
 
@@ -95718,7 +104414,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));
 
@@ -95739,7 +104439,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));
 
@@ -95762,7 +104466,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));
 
@@ -95783,7 +104491,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));
 
@@ -95807,7 +104519,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));
 
@@ -95828,7 +104544,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));
 
@@ -96005,7 +104725,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));
 
@@ -96029,7 +104753,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));
 
@@ -96053,7 +104781,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));
 
@@ -96081,7 +104813,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));
 
@@ -96108,7 +104844,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));
 
@@ -96129,7 +104869,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));
 
@@ -96153,7 +104897,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));
 
@@ -96294,7 +105042,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));
 
@@ -96316,7 +105068,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));
 
@@ -96338,7 +105094,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));
 
@@ -96843,7 +105603,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));
 
@@ -96871,7 +105635,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));
 
@@ -96897,7 +105665,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));
 
@@ -96925,7 +105697,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));
 
@@ -96951,7 +105727,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();
@@ -96968,7 +105748,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));
 
@@ -96994,7 +105778,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));
 
@@ -97022,7 +105810,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));
 
@@ -97048,7 +105840,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));
 
@@ -97076,7 +105872,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));
 
@@ -97102,7 +105902,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));
 
@@ -97130,7 +105934,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));
 
@@ -97156,7 +105964,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));
 
@@ -97184,7 +105996,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));
 
@@ -97210,7 +106026,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));
 
@@ -97238,7 +106058,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));
 
@@ -97264,7 +106088,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));
 
@@ -97292,7 +106120,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));
 
@@ -97318,7 +106150,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();
@@ -97335,7 +106171,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));
 
@@ -97361,7 +106201,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));
 
@@ -97389,7 +106233,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));
 
@@ -97415,7 +106263,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));
 
@@ -97443,7 +106295,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));
 
@@ -97469,7 +106325,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();
@@ -97486,7 +106346,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));
 
@@ -97805,7 +106669,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));
 
@@ -97829,7 +106697,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));
 
@@ -97853,7 +106725,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));
 
@@ -97872,7 +106748,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));
 
@@ -97891,7 +106771,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));
 
@@ -97910,7 +106794,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));
 
@@ -97929,7 +106817,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));
 
@@ -97972,7 +106864,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));
 
@@ -98014,7 +106910,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));
 
@@ -98035,7 +106935,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));
 
@@ -98063,7 +106967,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));
 
@@ -98117,7 +107025,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));
 
@@ -98138,7 +107050,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));
 
@@ -98159,7 +107075,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));
 
@@ -98180,7 +107100,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));
 
@@ -98204,7 +107128,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));
 
@@ -98225,7 +107153,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));
 
@@ -98710,7 +107642,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));
 
@@ -98733,7 +107669,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));
 
@@ -98752,7 +107692,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));
 
@@ -98771,7 +107715,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));
 
@@ -98790,7 +107738,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));
 
@@ -98809,7 +107761,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));
 
@@ -98828,7 +107784,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));
 
@@ -98847,7 +107807,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));
 
@@ -98866,7 +107830,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));
 
@@ -98885,7 +107853,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));
 
@@ -98912,7 +107884,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));
 
@@ -98938,7 +107914,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));
 
@@ -98958,7 +107938,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));
 
@@ -98978,7 +107962,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));
 
@@ -99003,7 +107991,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));
 
@@ -99028,7 +108020,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));
 
@@ -99049,7 +108045,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));
 
@@ -99070,7 +108070,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));
 
@@ -99090,7 +108094,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));
 
@@ -99110,7 +108118,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));
 
@@ -99130,7 +108142,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));
 
@@ -99150,7 +108166,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));
 
@@ -99170,7 +108190,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));
 
@@ -99191,7 +108215,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));
 
@@ -99212,7 +108240,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));
 
@@ -99232,7 +108264,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));
 
@@ -99252,7 +108288,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));
 
@@ -99272,7 +108312,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));
 
@@ -99292,7 +108336,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));
 
@@ -99312,7 +108360,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));
 
@@ -99479,7 +108531,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));
 
@@ -99498,7 +108554,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));
 
@@ -99520,7 +108580,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));
 
@@ -99549,7 +108613,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));
 
@@ -99567,7 +108635,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));
 
@@ -99735,7 +108807,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));
 
@@ -99759,7 +108835,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));
 
@@ -99783,7 +108863,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));
 
@@ -99810,7 +108894,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));
 
@@ -99836,7 +108924,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));
 
@@ -99860,7 +108952,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));
 
@@ -99979,7 +109075,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));
 
@@ -100125,7 +109225,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));
 
@@ -100143,7 +109247,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));
 
@@ -100291,7 +109399,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();
@@ -100317,7 +109429,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();
@@ -100475,7 +109591,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));
 
@@ -100493,7 +109613,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));
 
@@ -100529,7 +109653,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));
 
@@ -100547,7 +109675,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));
 
@@ -100824,7 +109956,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));
 
@@ -100848,7 +109984,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));
 
@@ -100872,7 +110012,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));
 
@@ -100891,7 +110035,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));
 
@@ -100910,7 +110058,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));
 
@@ -100941,7 +110093,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));
 
@@ -100971,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 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));
 
@@ -100996,7 +110156,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));
 
@@ -101018,7 +110182,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));
 
@@ -101039,7 +110207,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));
 
@@ -101063,7 +110235,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));
 
@@ -101084,7 +110260,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));
 
@@ -101335,7 +110515,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));
 
@@ -101358,7 +110542,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));
 
@@ -101381,7 +110569,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));
 
@@ -101406,7 +110598,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));
 
@@ -101431,7 +110627,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));
 
@@ -101456,7 +110656,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));
 
@@ -101481,7 +110685,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));
 
@@ -101506,7 +110714,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));
 
@@ -101531,7 +110743,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));
 
@@ -101556,7 +110772,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));
 
@@ -101581,7 +110801,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));
 
@@ -101606,7 +110830,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));
 
@@ -101629,7 +110857,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));
 
@@ -101814,7 +111046,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));
 
@@ -101832,7 +111068,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));
 
@@ -101857,7 +111097,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));
 
@@ -101882,7 +111126,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));
 
@@ -101907,7 +111155,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));
 
@@ -101932,7 +111184,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));
 
@@ -101957,7 +111213,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));
 
@@ -102274,7 +111534,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));
 
@@ -102301,7 +111565,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));
 
@@ -102325,7 +111593,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));
 
@@ -102344,7 +111616,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));
 
@@ -102363,7 +111639,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));
 
@@ -102382,7 +111662,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));
 
@@ -102401,7 +111685,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));
 
@@ -102420,7 +111708,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));
 
@@ -102451,7 +111743,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));
 
@@ -102481,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 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));
 
@@ -102502,7 +111802,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));
 
@@ -102524,7 +111828,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));
 
@@ -102546,7 +111854,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));
 
@@ -102568,7 +111880,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));
 
@@ -102590,7 +111906,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));
 
@@ -102613,7 +111933,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));
 
@@ -102634,7 +111958,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));
 
@@ -102655,7 +111983,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));
 
@@ -102676,7 +112008,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));
 
@@ -103059,7 +112395,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));
 
@@ -103081,7 +112421,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));
 
@@ -103103,7 +112447,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));
 
@@ -103125,7 +112473,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));
 
@@ -103147,7 +112499,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));
 
@@ -103172,7 +112528,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));
 
@@ -103190,7 +112550,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));
 
@@ -103215,7 +112579,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));
 
@@ -103240,7 +112608,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));
 
@@ -103265,7 +112637,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));
 
@@ -103291,7 +112667,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));
 
@@ -103317,7 +112697,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));
 
@@ -103343,7 +112727,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));
 
@@ -103369,7 +112757,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));
 
@@ -103394,7 +112786,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));
 
@@ -103416,7 +112812,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));
 
@@ -103438,7 +112838,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));
 
@@ -103460,7 +112864,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));
 
@@ -103485,7 +112893,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));
 
@@ -103510,7 +112922,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));
 
@@ -103535,7 +112951,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));
 
@@ -103560,7 +112980,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));
 
@@ -103582,7 +113006,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));
 
@@ -103604,7 +113032,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));
 
@@ -103629,7 +113061,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));
 
@@ -103793,7 +113229,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));
 
@@ -103812,7 +113252,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));
 
@@ -103831,7 +113275,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));
 
@@ -103850,7 +113298,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));
 
@@ -103869,7 +113321,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));
 
@@ -104162,7 +113618,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));
 
@@ -104180,7 +113640,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));
 
@@ -104204,7 +113668,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));
 
@@ -104222,7 +113690,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));
 
@@ -104246,7 +113718,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));
 
@@ -104265,7 +113741,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));
 
@@ -104290,7 +113770,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();
@@ -104310,7 +113794,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));
 
@@ -104328,7 +113816,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));
 
@@ -104349,7 +113841,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));
 
@@ -104371,7 +113867,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));
 
@@ -104392,7 +113892,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));
 
@@ -104411,7 +113915,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();
@@ -104429,7 +113937,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));
 
@@ -104456,7 +113968,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));
 
@@ -104475,7 +113991,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));
 
@@ -104493,7 +114013,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));
 
@@ -104609,7 +114133,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));
 
@@ -105010,7 +114538,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));
 
@@ -105036,7 +114568,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));
 
@@ -105061,7 +114597,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));
 
@@ -105086,7 +114626,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));
 
@@ -105111,7 +114655,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));
 
@@ -105137,7 +114685,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));
 
@@ -105163,7 +114715,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));
 
@@ -105187,7 +114743,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));
 
@@ -105220,7 +114780,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));
 
@@ -105246,7 +114810,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));
 
@@ -105264,7 +114832,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));
 
@@ -105288,7 +114860,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));
 
@@ -105312,7 +114888,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));
 
@@ -105336,7 +114916,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));
 
@@ -105368,7 +114952,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));
 
@@ -105393,7 +114981,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));
 
@@ -105418,7 +115010,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));
 
@@ -105443,7 +115039,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));
 
@@ -105469,7 +115069,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));
 
@@ -105495,7 +115099,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));
 
@@ -105526,7 +115134,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));
 
@@ -105551,7 +115163,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));
 
@@ -105955,7 +115571,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));
 
@@ -105981,7 +115601,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));
 
@@ -106006,7 +115630,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));
 
@@ -106031,7 +115659,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));
 
@@ -106056,7 +115688,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));
 
@@ -106082,7 +115718,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));
 
@@ -106108,7 +115748,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));
 
@@ -106132,7 +115776,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));
 
@@ -106165,7 +115813,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));
 
@@ -106191,7 +115843,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));
 
@@ -106209,7 +115865,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));
 
@@ -106233,7 +115893,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));
 
@@ -106257,7 +115921,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));
 
@@ -106281,7 +115949,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));
 
@@ -106313,7 +115985,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));
 
@@ -106338,7 +116014,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));
 
@@ -106363,7 +116043,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));
 
@@ -106388,7 +116072,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));
 
@@ -106414,7 +116102,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));
 
@@ -106440,7 +116132,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));
 
@@ -106471,7 +116167,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));
 
@@ -106496,7 +116196,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));
 
@@ -106765,7 +116469,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));
 
@@ -106792,7 +116500,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));
 
@@ -106818,7 +116530,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));
 
@@ -106850,7 +116566,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));
 
@@ -106880,7 +116600,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
@@ -106904,7 +116628,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));
 
@@ -106930,7 +116658,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));
 
@@ -106961,7 +116693,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));
 
@@ -106985,7 +116721,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));
 
@@ -107012,7 +116752,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));
 
@@ -107041,7 +116785,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));
 
@@ -107068,7 +116816,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));
 
@@ -107276,7 +117028,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));
 
@@ -107303,7 +117059,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));
 
@@ -107329,7 +117089,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));
 
@@ -107352,7 +117116,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));
 
@@ -107376,7 +117144,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));
 
@@ -107400,7 +117172,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));
 
@@ -107424,7 +117200,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));
 
@@ -107628,7 +117408,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));
 
@@ -107655,7 +117439,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));
 
@@ -107681,7 +117469,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));
 
@@ -107704,7 +117496,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));
 
@@ -107728,7 +117524,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));
 
@@ -107752,7 +117552,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));
 
@@ -107776,7 +117580,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));
 
@@ -108054,7 +117862,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));
 
@@ -108080,7 +117892,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));
 
@@ -108106,7 +117922,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));
 
@@ -108132,7 +117952,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));
 
@@ -108164,7 +117988,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));
 
@@ -108187,7 +118015,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));
 
@@ -108211,7 +118043,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));
 
@@ -108239,7 +118075,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));
 
@@ -108265,7 +118105,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));
 
@@ -108297,7 +118141,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));
 
@@ -108320,7 +118168,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));
 
@@ -108344,7 +118196,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));
 
@@ -108622,7 +118478,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));
 
@@ -108648,7 +118508,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));
 
@@ -108674,7 +118538,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));
 
@@ -108700,7 +118568,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));
 
@@ -108732,7 +118604,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));
 
@@ -108755,7 +118631,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));
 
@@ -108779,7 +118659,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));
 
@@ -108807,7 +118691,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));
 
@@ -108833,7 +118721,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));
 
@@ -108865,7 +118757,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));
 
@@ -108888,7 +118784,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));
 
@@ -108912,7 +118812,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));
 
@@ -109076,7 +118980,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));
 
@@ -109103,7 +119011,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));
 
@@ -109136,7 +119048,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();
@@ -109157,7 +119073,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();
@@ -109178,7 +119098,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();
@@ -109335,7 +119259,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));
 
@@ -109362,7 +119290,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));
 
@@ -109395,7 +119327,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();
@@ -109416,7 +119352,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();
@@ -109437,7 +119377,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();
@@ -109691,7 +119635,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));
 
@@ -109713,7 +119661,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));
 
@@ -109740,7 +119692,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));
 
@@ -109770,7 +119726,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));
 
@@ -109797,7 +119757,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));
 
@@ -109824,7 +119788,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));
 
@@ -109850,7 +119818,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));
 
@@ -109900,7 +119872,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));
 
@@ -109928,7 +119904,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));
 
@@ -110061,7 +120041,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));
 
@@ -110088,7 +120072,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));
 
@@ -110116,7 +120104,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));
 
@@ -110263,7 +120255,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));
 
@@ -110295,7 +120291,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));
 
@@ -110322,7 +120322,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));
 
@@ -110345,7 +120349,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));
 
@@ -110363,7 +120371,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));
 
@@ -110514,7 +120526,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));
 
@@ -110539,7 +120555,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));
 
@@ -110571,7 +120591,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));
 
@@ -110606,7 +120630,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));
 
@@ -110641,7 +120669,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));
 
@@ -110764,7 +120796,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));
 
@@ -110895,7 +120931,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));
 
@@ -110922,7 +120962,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));
 
@@ -110941,7 +120985,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));
 
@@ -111050,7 +121098,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));
 
@@ -111209,7 +121261,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));
 
@@ -111232,7 +121288,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));
 
@@ -111255,7 +121315,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));
 
@@ -111278,7 +121342,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));
 
@@ -111301,7 +121369,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));
 
@@ -111324,7 +121396,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));
 
@@ -111348,7 +121424,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));
 
@@ -111371,7 +121451,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));
 
@@ -111627,7 +121711,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));
 
@@ -111650,7 +121738,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));
 
@@ -111674,7 +121766,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));
 
@@ -111698,7 +121794,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));
 
@@ -111724,7 +121824,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));
 
@@ -111747,7 +121851,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));
 
@@ -111771,7 +121879,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));
 
@@ -111796,7 +121908,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));
 
@@ -111825,7 +121941,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));
 
@@ -111854,7 +121974,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));
 
@@ -111883,7 +122007,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));
 
@@ -111912,7 +122040,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));
 
@@ -111941,7 +122073,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));
 
@@ -111970,7 +122106,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));
 
@@ -111999,7 +122139,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));
 
@@ -112031,7 +122175,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));
 
@@ -112059,7 +122207,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));
 
@@ -112089,7 +122241,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));
 
@@ -112117,7 +122273,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));
 
@@ -112147,7 +122307,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));
 
@@ -112175,7 +122339,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));
 
@@ -112698,7 +122866,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));
 
@@ -112741,7 +122913,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));
 
@@ -112768,7 +122944,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));
 
@@ -112799,7 +122979,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));
 
@@ -112833,7 +123017,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));
 
@@ -112855,7 +123043,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));
 
@@ -112873,7 +123065,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));
 
@@ -112905,7 +123101,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));
 
@@ -112923,7 +123123,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));
 
@@ -112957,7 +123161,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));
 
@@ -112979,7 +123187,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));
 
@@ -112997,7 +123209,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));
 
@@ -113031,7 +123247,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));
 
@@ -113053,7 +123273,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));
 
@@ -113071,7 +123295,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));
 
@@ -113105,7 +123333,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));
 
@@ -113127,7 +123359,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));
 
@@ -113145,7 +123381,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));
 
@@ -113179,7 +123419,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));
 
@@ -113201,7 +123445,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));
 
@@ -113219,7 +123467,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));
 
@@ -113251,7 +123503,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));
 
@@ -113269,7 +123525,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));
 
@@ -113303,7 +123563,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));
 
@@ -113325,7 +123589,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));
 
@@ -113343,7 +123611,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));
 
@@ -113377,7 +123649,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));
 
@@ -113399,7 +123675,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));
 
@@ -113417,7 +123697,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));
 
@@ -113451,7 +123735,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));
 
@@ -113473,7 +123761,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));
 
@@ -113491,7 +123783,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));
 
@@ -113523,7 +123819,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));
 
@@ -113541,7 +123841,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));
 
@@ -113575,7 +123879,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));
 
@@ -113597,7 +123905,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));
 
@@ -113615,7 +123927,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));
 
@@ -113649,7 +123965,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));
 
@@ -113671,7 +123991,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));
 
@@ -113689,7 +124013,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));
 
@@ -113723,7 +124051,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));
 
@@ -113745,7 +124077,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));
 
@@ -113763,7 +124099,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));
 
@@ -113795,7 +124135,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));
 
@@ -113813,7 +124157,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));
 
@@ -113847,7 +124195,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));
 
@@ -113869,7 +124221,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));
 
@@ -113887,7 +124243,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));
 
@@ -113921,7 +124281,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));
 
@@ -113943,7 +124307,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));
 
@@ -113961,7 +124329,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));
 
@@ -113995,7 +124367,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));
 
@@ -114017,7 +124393,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));
 
@@ -114035,7 +124415,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));
 
@@ -114067,7 +124451,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));
 
@@ -114085,7 +124473,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));
 
@@ -114119,7 +124511,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));
 
@@ -114141,7 +124537,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));
 
@@ -114159,7 +124559,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));
 
@@ -114279,7 +124683,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));
 
@@ -114409,7 +124817,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));
 
@@ -114434,7 +124846,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));
 
@@ -114481,7 +124897,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));
 
@@ -114570,7 +124990,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));
 
@@ -114731,7 +125155,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));
 
@@ -114762,7 +125190,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));
 
@@ -114789,7 +125221,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));
 
@@ -114808,7 +125244,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));
 
@@ -114827,7 +125267,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));
 
@@ -114850,7 +125294,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));
 
@@ -114868,7 +125316,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));
 
@@ -115025,7 +125477,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));
 
@@ -115065,7 +125521,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();
@@ -115092,7 +125552,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));
 
@@ -118637,7 +129101,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));
 
@@ -118656,7 +129124,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();
@@ -118674,7 +129146,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));
 
@@ -118703,7 +129179,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));
 
@@ -118732,7 +129212,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();
@@ -118749,7 +129233,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));
 
@@ -118775,7 +129263,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));
 
@@ -118793,7 +129285,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));
 
@@ -118819,7 +129315,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));
 
@@ -118837,7 +129337,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));
 
@@ -118860,7 +129364,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));
 
@@ -118886,7 +129394,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));
 
@@ -118904,7 +129416,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));
 
@@ -118930,7 +129446,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));
 
@@ -118948,7 +129468,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));
 
@@ -118971,7 +129495,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));
 
@@ -118997,7 +129525,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));
 
@@ -119015,7 +129547,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));
 
@@ -119041,7 +129577,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));
 
@@ -119059,7 +129599,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));
 
@@ -119082,7 +129626,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));
 
@@ -119108,7 +129656,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));
 
@@ -119126,7 +129678,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));
 
@@ -119152,7 +129708,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));
 
@@ -119170,7 +129730,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));
 
@@ -119193,7 +129757,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));
 
@@ -119219,7 +129787,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));
 
@@ -119237,7 +129809,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));
 
@@ -119263,7 +129839,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));
 
@@ -119281,7 +129861,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));
 
@@ -119304,7 +129888,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));
 
@@ -119330,7 +129918,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));
 
@@ -119348,7 +129940,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));
 
@@ -119374,7 +129970,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));
 
@@ -119392,7 +129992,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));
 
@@ -119415,7 +130019,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));
 
@@ -119441,7 +130049,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));
 
@@ -119459,7 +130071,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));
 
@@ -119485,7 +130101,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));
 
@@ -119503,7 +130123,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));
 
@@ -119526,7 +130150,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));
 
@@ -119552,7 +130180,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));
 
@@ -119570,7 +130202,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));
 
@@ -119596,7 +130232,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));
 
@@ -119614,7 +130254,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));
 
@@ -119637,7 +130281,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));
 
@@ -119663,7 +130311,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));
 
@@ -119681,7 +130333,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));
 
@@ -119707,7 +130363,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));
 
@@ -119725,7 +130385,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));
 
@@ -119748,7 +130412,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));
 
@@ -119774,7 +130442,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));
 
@@ -119792,7 +130464,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));
 
@@ -119818,7 +130494,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));
 
@@ -119836,7 +130516,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));
 
@@ -119862,7 +130546,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));
 
@@ -119880,7 +130568,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));
 
@@ -119903,7 +130595,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));
 
@@ -119929,7 +130625,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));
 
@@ -119947,7 +130647,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));
 
@@ -119973,7 +130677,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));
 
@@ -119991,7 +130699,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));
 
@@ -120017,7 +130729,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));
 
@@ -120035,7 +130751,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));
 
@@ -120058,7 +130778,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));
 
@@ -120084,7 +130808,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));
 
@@ -120102,7 +130830,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));
 
@@ -120128,7 +130860,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));
 
@@ -120146,7 +130882,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));
 
@@ -120172,7 +130912,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));
 
@@ -120190,7 +130934,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));
 
@@ -120213,7 +130961,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));
 
@@ -120239,7 +130991,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));
 
@@ -120257,7 +131013,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));
 
@@ -120283,7 +131043,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));
 
@@ -120301,7 +131065,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));
 
@@ -120327,7 +131095,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));
 
@@ -120345,7 +131117,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));
 
@@ -120368,7 +131144,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));
 
@@ -120394,7 +131174,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));
 
@@ -120412,7 +131196,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));
 
@@ -120438,7 +131226,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));
 
@@ -120456,7 +131248,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));
 
@@ -120482,7 +131278,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));
 
@@ -120500,7 +131300,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));
 
@@ -120526,7 +131330,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));
 
@@ -120544,7 +131352,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));
 
@@ -120567,7 +131379,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));
 
@@ -120593,7 +131409,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));
 
@@ -120611,7 +131431,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));
 
@@ -120637,7 +131461,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));
 
@@ -120655,7 +131483,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));
 
@@ -120681,7 +131513,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));
 
@@ -120699,7 +131535,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));
 
@@ -120725,7 +131565,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));
 
@@ -120743,7 +131587,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));
 
@@ -120766,7 +131614,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));
 
@@ -120792,7 +131644,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));
 
@@ -120810,7 +131666,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));
 
@@ -120836,7 +131696,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));
 
@@ -120854,7 +131718,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));
 
@@ -120877,7 +131745,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));
 
@@ -120903,7 +131775,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));
 
@@ -120921,7 +131797,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));
 
@@ -120947,7 +131827,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));
 
@@ -120965,7 +131849,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));
 
@@ -120988,7 +131876,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));
 
@@ -121014,7 +131906,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));
 
@@ -121032,7 +131928,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));
 
@@ -121058,7 +131958,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));
 
@@ -121076,7 +131980,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));
 
@@ -121102,7 +132010,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));
 
@@ -121120,7 +132032,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));
 
@@ -121146,7 +132062,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));
 
@@ -121164,7 +132084,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));
 
@@ -121190,7 +132114,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();
@@ -121207,7 +132135,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));
 
@@ -121233,7 +132165,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));
 
@@ -121251,7 +132187,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));
 
@@ -121277,7 +132217,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));
 
@@ -121295,7 +132239,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));
 
@@ -121321,7 +132269,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));
 
@@ -121339,7 +132291,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));
 
@@ -121364,7 +132320,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));
 
@@ -121382,7 +132342,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));
 
@@ -121407,7 +132371,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();
@@ -121424,7 +132392,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));
 
@@ -121449,7 +132421,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));
 
@@ -121467,7 +132443,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));
 
@@ -121492,7 +132472,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));
 
@@ -121510,7 +132494,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));
 
@@ -121535,7 +132523,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));
 
@@ -121553,7 +132545,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));
 
@@ -121595,7 +132591,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));
 
@@ -121613,7 +132613,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));
 
@@ -121654,7 +132658,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));
 
@@ -121672,7 +132680,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));
 
@@ -121698,7 +132710,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));
 
@@ -121716,7 +132732,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));
 
@@ -121742,7 +132762,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));
 
@@ -121760,7 +132784,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));
 
@@ -121783,7 +132811,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));
 
@@ -121809,7 +132841,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));
 
@@ -121827,7 +132863,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));
 
@@ -121853,7 +132893,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));
 
@@ -121871,7 +132915,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));
 
@@ -121894,7 +132942,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();
@@ -121914,7 +132966,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();
@@ -121932,7 +132988,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();
@@ -121950,7 +133010,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();
@@ -121967,7 +133031,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));
 
@@ -121993,7 +133061,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));
 
@@ -122011,7 +133083,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));
 
@@ -122037,7 +133113,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));
 
@@ -122061,7 +133141,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));
 
@@ -122095,7 +133179,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();
@@ -122131,7 +133219,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));
 
@@ -122173,7 +133265,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));
 
@@ -122220,7 +133316,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));
 
@@ -122267,7 +133367,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));
 
@@ -122381,7 +133485,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));
 
@@ -122495,7 +133603,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));
 
@@ -122537,7 +133649,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));
 
@@ -122591,7 +133707,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));
 
@@ -122640,7 +133760,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));
 
@@ -122687,7 +133811,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));
 
@@ -122725,7 +133853,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));
 
@@ -122788,7 +133920,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));
 
@@ -122851,7 +133987,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));
 
@@ -122969,7 +134109,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));
 
@@ -123087,7 +134231,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));
 
@@ -123123,7 +134271,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));
 
@@ -123141,7 +134293,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));
 
@@ -123181,7 +134337,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));
 
@@ -123199,7 +134359,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));
 
@@ -123255,7 +134419,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));
 
@@ -123273,7 +134441,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));
 
@@ -123308,7 +134480,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));
 
@@ -123349,7 +134525,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));
 
@@ -123372,7 +134552,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));
 
@@ -123417,7 +134601,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));
 
@@ -123435,7 +134623,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));
 
@@ -123467,7 +134659,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));
 
@@ -123486,7 +134682,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));
 
@@ -123515,7 +134715,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));
 
@@ -123533,7 +134737,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));
 
@@ -123557,7 +134765,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));
 
@@ -123582,7 +134794,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));
 
@@ -123600,7 +134816,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));
 
@@ -123627,7 +134847,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();
@@ -123645,7 +134869,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));
 
@@ -123674,7 +134902,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));
 
@@ -123692,7 +134924,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));
 
@@ -123715,7 +134951,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));
 
@@ -123740,7 +134980,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));
 
@@ -123758,7 +135002,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));
 
@@ -123785,7 +135033,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();
@@ -123802,7 +135054,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));
 
@@ -123828,7 +135084,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));
 
@@ -123846,7 +135106,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));
 
@@ -123872,7 +135136,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));
 
@@ -123890,7 +135158,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));
 
@@ -123917,7 +135189,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();
@@ -123934,7 +135210,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));
 
@@ -123960,7 +135240,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));
 
@@ -123978,7 +135262,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));
 
@@ -124004,7 +135292,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));
 
@@ -124022,7 +135314,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));
 
@@ -124049,7 +135345,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();
@@ -124066,7 +135366,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));
 
@@ -124092,7 +135396,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));
 
@@ -124110,7 +135418,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));
 
@@ -124136,7 +135448,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));
 
@@ -124154,7 +135470,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));
 
@@ -124181,7 +135501,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));
 
@@ -124199,7 +135523,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));
 
@@ -124226,7 +135554,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();
@@ -124243,7 +135575,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));
 
@@ -124267,7 +135603,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));
 
@@ -124291,7 +135631,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));
 
@@ -124309,7 +135653,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));
 
@@ -124332,7 +135680,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));
 
@@ -124356,7 +135708,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));
 
@@ -124381,7 +135737,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));
 
@@ -124399,7 +135759,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));
 
@@ -124423,7 +135787,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));
 
@@ -124448,7 +135816,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));
 
@@ -124466,7 +135838,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));
 
@@ -124493,7 +135869,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));
 
@@ -124511,7 +135891,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));
 
@@ -124538,7 +135922,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();
@@ -124555,7 +135943,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));
 
@@ -124581,7 +135973,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));
 
@@ -124599,7 +135995,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));
 
@@ -124622,7 +136022,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));
 
@@ -124646,7 +136050,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));
 
@@ -124671,7 +136079,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));
 
@@ -124689,7 +136101,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));
 
@@ -124713,7 +136129,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));
 
@@ -124738,7 +136158,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));
 
@@ -124756,7 +136180,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));
 
@@ -124783,7 +136211,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));
 
@@ -124801,7 +136233,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));
 
@@ -124828,7 +136264,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();
@@ -124845,7 +136285,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));
 
@@ -124871,7 +136315,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));
 
@@ -124889,7 +136337,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));
 
@@ -124912,7 +136364,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));
 
@@ -124936,7 +136392,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));
 
@@ -124961,7 +136421,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));
 
@@ -124979,7 +136443,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));
 
@@ -125003,7 +136471,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));
 
@@ -125028,7 +136500,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));
 
@@ -125046,7 +136522,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));
 
@@ -125073,7 +136553,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));
 
@@ -125091,7 +136575,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));
 
@@ -125118,7 +136606,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();
@@ -125135,7 +136627,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));
 
@@ -125161,7 +136657,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));
 
@@ -125179,7 +136679,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));
 
@@ -125202,7 +136706,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));
 
@@ -125226,7 +136734,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));
 
@@ -125251,7 +136763,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));
 
@@ -125269,7 +136785,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));
 
@@ -125293,7 +136813,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));
 
@@ -125318,7 +136842,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));
 
@@ -125336,7 +136864,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));
 
@@ -125363,7 +136895,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();
@@ -125380,7 +136916,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));
 
@@ -125406,7 +136946,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));
 
@@ -125424,7 +136968,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));
 
@@ -125447,7 +136995,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));
 
@@ -125471,7 +137023,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));
 
@@ -125496,7 +137052,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));
 
@@ -125514,7 +137074,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));
 
@@ -125538,7 +137102,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));
 
@@ -125563,7 +137131,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));
 
@@ -125581,7 +137153,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));
 
@@ -125608,7 +137184,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();
@@ -125625,7 +137205,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));
 
@@ -125651,7 +137235,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));
 
@@ -125669,7 +137257,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));
 
@@ -125692,7 +137284,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));
 
@@ -125716,7 +137312,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));
 
@@ -125741,7 +137341,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));
 
@@ -125759,7 +137363,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));
 
@@ -125783,7 +137391,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));
 
@@ -125808,7 +137420,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));
 
@@ -125826,7 +137442,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));
 
@@ -125853,7 +137473,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();
@@ -125870,7 +137494,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));
 
@@ -125896,7 +137524,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));
 
@@ -125914,7 +137546,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));
 
@@ -125937,7 +137573,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));
 
@@ -125961,7 +137601,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));
 
@@ -125986,7 +137630,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));
 
@@ -126004,7 +137652,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));
 
@@ -126028,7 +137680,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));
 
@@ -126053,7 +137709,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));
 
@@ -126071,7 +137731,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));
 
@@ -126098,7 +137762,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();
@@ -126115,7 +137783,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));
 
@@ -126141,7 +137813,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));
 
@@ -126159,7 +137835,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));
 
@@ -126182,7 +137862,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));
 
@@ -126206,7 +137890,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));
 
@@ -126231,7 +137919,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));
 
@@ -126249,7 +137941,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));
 
@@ -126273,7 +137969,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));
 
@@ -126298,7 +137998,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));
 
@@ -126316,7 +138020,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));
 
@@ -126343,7 +138051,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));
 
@@ -126361,7 +138073,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));
 
@@ -126388,7 +138104,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));
 
@@ -126406,7 +138126,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));
 
@@ -126432,7 +138156,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));
 
@@ -126450,7 +138178,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));
 
@@ -126476,7 +138208,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));
 
@@ -126494,7 +138230,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));
 
@@ -126521,7 +138261,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));
 
@@ -126539,7 +138283,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));
 
@@ -126566,7 +138314,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));
 
@@ -126584,7 +138336,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));
 
@@ -126611,7 +138367,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));
 
@@ -126629,7 +138389,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));
 
@@ -126655,7 +138419,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));
 
@@ -126673,7 +138441,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));
 
@@ -126699,7 +138471,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));
 
@@ -126717,7 +138493,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));
 
@@ -126744,7 +138524,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));
 
@@ -126762,7 +138546,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));
 
@@ -126789,7 +138577,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));
 
@@ -126807,7 +138599,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));
 
@@ -126834,7 +138630,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();
@@ -126851,7 +138651,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));
 
@@ -126877,7 +138681,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));
 
@@ -126895,7 +138703,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));
 
@@ -126921,7 +138733,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));
 
@@ -126939,7 +138755,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));
 
@@ -126966,7 +138786,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));
 
@@ -126984,7 +138808,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));
 
@@ -127011,7 +138839,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();
@@ -127028,7 +138860,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));
 
@@ -127054,7 +138890,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));
 
@@ -127072,7 +138912,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));
 
@@ -127098,7 +138942,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));
 
@@ -127116,7 +138964,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));
 
@@ -127143,7 +138995,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));
 
@@ -127161,7 +139017,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));
 
@@ -127188,7 +139048,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();
@@ -127206,7 +139070,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));
 
@@ -127235,7 +139103,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));
 
@@ -127253,7 +139125,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));
 
@@ -127276,7 +139152,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));
 
@@ -127298,7 +139178,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));
 
@@ -127325,7 +139209,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));
 
@@ -127344,7 +139232,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));
 
@@ -127373,7 +139265,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));
 
@@ -127391,7 +139287,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));
 
@@ -127417,7 +139317,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));
 
@@ -127435,7 +139339,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));
 
@@ -127459,7 +139367,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));
 
@@ -127481,7 +139393,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));
 
@@ -127507,7 +139423,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));
 
@@ -127526,7 +139446,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));
 
@@ -127553,7 +139477,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));
 
@@ -127583,7 +139511,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));
 
@@ -127601,7 +139533,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));
 
@@ -127626,7 +139562,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));
 
@@ -127644,7 +139584,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));
 
@@ -127668,7 +139612,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));
 
@@ -127690,7 +139638,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();
@@ -127707,7 +139659,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();
@@ -127726,7 +139682,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();
@@ -127747,7 +139707,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));
 
@@ -127769,7 +139733,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));
 
@@ -127807,7 +139775,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
@@ -127843,7 +139815,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));
 
@@ -127862,7 +139838,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));
 
@@ -127889,7 +139869,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));
 
@@ -127915,7 +139899,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();
@@ -127935,7 +139923,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();
@@ -127955,7 +139947,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();
@@ -127975,7 +139971,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();
@@ -127992,7 +139992,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));
 
@@ -128018,7 +140022,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));
 
@@ -128036,7 +140044,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));
 
@@ -128062,7 +140074,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));
 
@@ -128080,7 +140096,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));
 
@@ -128106,7 +140126,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));
 
@@ -128124,7 +140148,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));
 
@@ -128147,7 +140175,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));
 
@@ -128173,7 +140205,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();
@@ -128193,7 +140229,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();
@@ -128213,7 +140253,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();
@@ -128233,7 +140277,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();
@@ -128250,7 +140298,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));
 
@@ -128276,7 +140328,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));
 
@@ -128294,7 +140350,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));
 
@@ -128320,7 +140380,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));
 
@@ -128338,7 +140402,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));
 
@@ -128364,7 +140432,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));
 
@@ -128382,7 +140454,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));
 
@@ -128405,7 +140481,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));
 
@@ -128431,7 +140511,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();
@@ -128451,7 +140535,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();
@@ -128471,7 +140559,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();
@@ -128491,7 +140583,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();
@@ -128508,7 +140604,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));
 
@@ -128534,7 +140634,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));
 
@@ -128552,7 +140656,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));
 
@@ -128578,7 +140686,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));
 
@@ -128596,7 +140708,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));
 
@@ -128622,7 +140738,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));
 
@@ -128640,7 +140760,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));
 
@@ -128663,7 +140787,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));
 
@@ -128689,7 +140817,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();
@@ -128709,7 +140841,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();
@@ -128729,7 +140865,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();
@@ -128749,7 +140889,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();
@@ -128766,7 +140910,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));
 
@@ -128792,7 +140940,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));
 
@@ -128810,7 +140962,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));
 
@@ -128836,7 +140992,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));
 
@@ -128854,7 +141014,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));
 
@@ -128880,7 +141044,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));
 
@@ -128898,7 +141066,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));
 
@@ -128921,7 +141093,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));
 
@@ -128948,7 +141124,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();
@@ -128968,7 +141148,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();
@@ -128988,7 +141172,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();
@@ -129008,7 +141196,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();
@@ -129025,7 +141217,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));
 
@@ -129052,7 +141248,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));
 
@@ -129070,7 +141270,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));
 
@@ -129097,7 +141301,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));
 
@@ -129115,7 +141323,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));
 
@@ -129142,7 +141354,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));
 
@@ -129160,7 +141376,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));
 
@@ -129186,7 +141406,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));
 
@@ -129204,7 +141428,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));
 
@@ -129227,7 +141455,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));
 
@@ -129254,7 +141486,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();
@@ -129274,7 +141510,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();
@@ -129294,7 +141534,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();
@@ -129314,7 +141558,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();
@@ -129331,7 +141579,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));
 
@@ -129358,7 +141610,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));
 
@@ -129376,7 +141632,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));
 
@@ -129403,7 +141663,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));
 
@@ -129421,7 +141685,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));
 
@@ -129448,7 +141716,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));
 
@@ -129466,7 +141738,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));
 
@@ -129492,7 +141768,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));
 
@@ -129510,7 +141790,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));
 
@@ -129533,7 +141817,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));
 
@@ -129560,7 +141848,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();
@@ -129580,7 +141872,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();
@@ -129600,7 +141896,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();
@@ -129620,7 +141920,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();
@@ -129637,7 +141941,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));
 
@@ -129664,7 +141972,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));
 
@@ -129682,7 +141994,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));
 
@@ -129709,7 +142025,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));
 
@@ -129727,7 +142047,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));
 
@@ -129754,7 +142078,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));
 
@@ -129772,7 +142100,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));
 
@@ -129798,7 +142130,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));
 
@@ -129816,7 +142152,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));
 
@@ -129839,7 +142179,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));
 
@@ -129866,7 +142210,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();
@@ -129886,7 +142234,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();
@@ -129906,7 +142258,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();
@@ -129926,7 +142282,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();
@@ -129943,7 +142303,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));
 
@@ -129970,7 +142334,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));
 
@@ -129988,7 +142356,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));
 
@@ -130015,7 +142387,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));
 
@@ -130033,7 +142409,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));
 
@@ -130060,7 +142440,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));
 
@@ -130078,7 +142462,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));
 
@@ -130104,7 +142492,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));
 
@@ -130122,7 +142514,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));
 
@@ -130148,7 +142544,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();
@@ -130168,7 +142568,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();
@@ -130185,7 +142589,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();
@@ -130202,7 +142610,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();
@@ -130219,7 +142631,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));
 
@@ -130260,7 +142676,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));
 
@@ -130310,7 +142730,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));
 
@@ -130328,7 +142752,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));
 
@@ -130875,7 +143303,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));
 
@@ -130893,7 +143325,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));
 
@@ -130915,7 +143351,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));
 
@@ -130941,7 +143381,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));
 
@@ -130959,7 +143403,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));
 
@@ -130985,7 +143433,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));
 
@@ -131003,7 +143455,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));
 
@@ -131026,7 +143482,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));
 
@@ -131049,7 +143509,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));
 
@@ -131072,7 +143536,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));
 
@@ -131098,7 +143566,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));
 
@@ -131116,7 +143588,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));
 
@@ -131142,7 +143618,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));
 
@@ -131163,7 +143643,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));
 
@@ -131181,7 +143665,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));
 
@@ -131201,7 +143689,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));
 
@@ -131221,7 +143713,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));
 
@@ -131244,7 +143740,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));
 
@@ -131264,7 +143764,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));
 
@@ -131282,7 +143786,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));
 
@@ -131301,7 +143809,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));
 
@@ -131320,7 +143832,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));
 
@@ -131339,7 +143855,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));
 
@@ -131360,7 +143880,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));
 
@@ -131378,7 +143902,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));
 
@@ -131400,7 +143928,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));
 
@@ -131418,7 +143950,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));
 
@@ -131440,7 +143976,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));
 
@@ -131458,7 +143998,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));
 
@@ -131480,7 +144024,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));
 
@@ -131498,7 +144046,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));
 
@@ -131520,7 +144072,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));
 
@@ -131538,7 +144094,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));
 
@@ -131560,7 +144120,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));
 
@@ -131578,7 +144142,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));
 
@@ -131600,7 +144168,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));
 
@@ -131618,7 +144190,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));
 
@@ -131640,7 +144216,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));
 
@@ -131658,7 +144238,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));
 
@@ -131680,7 +144264,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));
 
@@ -131698,7 +144286,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));
 
@@ -131719,7 +144311,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));
 
@@ -131737,7 +144333,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));
 
@@ -131758,7 +144358,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));
 
@@ -131778,7 +144382,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));
 
@@ -131796,7 +144404,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));
 
@@ -131819,7 +144431,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));
 
@@ -131844,7 +144460,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));
 
@@ -131862,7 +144482,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));
 
@@ -131889,7 +144513,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));
 
@@ -131907,7 +144535,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));
 
@@ -131930,7 +144562,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));
 
@@ -131948,7 +144584,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));
 
@@ -131972,7 +144612,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));
 
@@ -131990,7 +144634,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));
 
@@ -132017,7 +144665,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));
 
@@ -132035,7 +144687,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));
 
@@ -132058,7 +144714,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));
 
@@ -132076,7 +144736,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));
 
@@ -132100,7 +144764,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));
 
@@ -133220,7 +145888,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));
 
@@ -133252,7 +145924,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));
 
@@ -133281,7 +145957,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));
 
@@ -133302,7 +145982,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));
 
@@ -133331,7 +146015,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));
 
@@ -133349,7 +146037,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));
 
@@ -133372,7 +146064,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));
 
@@ -133390,7 +146086,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));
 
@@ -133414,7 +146114,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));
 
@@ -133443,7 +146147,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));
 
@@ -133461,7 +146169,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));
 
@@ -133484,7 +146196,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));
 
@@ -133502,7 +146218,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));
 
@@ -133526,7 +146246,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));
 
@@ -133555,7 +146279,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));
 
@@ -133573,7 +146301,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));
 
@@ -133596,7 +146328,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));
 
@@ -133614,7 +146350,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));
 
@@ -133638,7 +146378,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));
 
@@ -133667,7 +146411,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));
 
@@ -133685,7 +146433,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));
 
@@ -133708,7 +146460,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));
 
@@ -133726,7 +146482,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));
 
@@ -133750,7 +146510,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));
 
@@ -133779,7 +146543,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));
 
@@ -133797,7 +146565,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));
 
@@ -133820,7 +146592,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));
 
@@ -133838,7 +146614,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));
 
@@ -133862,7 +146642,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));
 
@@ -133891,7 +146675,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));
 
@@ -133909,7 +146697,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));
 
@@ -133932,7 +146724,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));
 
@@ -133950,7 +146746,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));
 
@@ -133974,7 +146774,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));
 
@@ -134003,7 +146807,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));
 
@@ -134021,7 +146829,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));
 
@@ -134044,7 +146856,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));
 
@@ -134062,7 +146878,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));
 
@@ -134086,7 +146906,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));
 
@@ -134115,7 +146939,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));
 
@@ -134133,7 +146961,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));
 
@@ -134156,7 +146988,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));
 
@@ -134174,7 +147010,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));
 
@@ -134198,7 +147038,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));
 
@@ -134227,7 +147071,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));
 
@@ -134245,7 +147093,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));
 
@@ -134268,7 +147120,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));
 
@@ -134286,7 +147142,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));
 
@@ -134310,7 +147170,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));
 
@@ -134339,7 +147203,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));
 
@@ -134357,7 +147225,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));
 
@@ -134380,7 +147252,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));
 
@@ -134398,7 +147274,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));
 
@@ -134422,7 +147302,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));
 
@@ -134451,7 +147335,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));
 
@@ -134469,7 +147357,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));
 
@@ -134492,7 +147384,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));
 
@@ -134510,7 +147406,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));
 
@@ -134534,7 +147434,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));
 
@@ -134563,7 +147467,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));
 
@@ -134581,7 +147489,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));
 
@@ -134604,7 +147516,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));
 
@@ -134622,7 +147538,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));
 
@@ -134646,7 +147566,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));
 
@@ -134675,7 +147599,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));
 
@@ -134693,7 +147621,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));
 
@@ -134716,7 +147648,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));
 
@@ -134734,7 +147670,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));
 
@@ -134758,7 +147698,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));
 
@@ -134787,7 +147731,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));
 
@@ -134805,7 +147753,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));
 
@@ -134828,7 +147780,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));
 
@@ -134846,7 +147802,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));
 
@@ -134870,7 +147830,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));
 
@@ -134899,7 +147863,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));
 
@@ -134917,7 +147885,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));
 
@@ -134940,7 +147912,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));
 
@@ -134958,7 +147934,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));
 
@@ -134982,7 +147962,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));
 
@@ -135011,7 +147995,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));
 
@@ -135029,7 +148017,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));
 
@@ -135052,7 +148044,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));
 
@@ -135070,7 +148066,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));
 
@@ -135094,7 +148094,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));
 
@@ -135123,7 +148127,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));
 
@@ -135141,7 +148149,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));
 
@@ -135164,7 +148176,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));
 
@@ -135182,7 +148198,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));
 
@@ -135206,7 +148226,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));
 
@@ -135235,7 +148259,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));
 
@@ -135253,7 +148281,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));
 
@@ -135276,7 +148308,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));
 
@@ -135294,7 +148330,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));
 
@@ -135318,7 +148358,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));
 
@@ -135344,7 +148388,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));
 
@@ -135369,7 +148417,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));
 
@@ -135388,7 +148440,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));
 
@@ -135416,7 +148472,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));
 
@@ -135444,7 +148504,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));
 
@@ -135462,7 +148526,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));
 
@@ -135488,7 +148556,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));
 
@@ -135507,7 +148579,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));
 
@@ -135533,7 +148609,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));
 
@@ -135559,7 +148639,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));
 
@@ -135578,7 +148662,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));
 
@@ -135606,7 +148694,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));
 
@@ -135634,7 +148726,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));
 
@@ -135652,7 +148748,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));
 
@@ -135678,7 +148778,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));
 
@@ -135697,7 +148801,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));
 
@@ -135726,7 +148834,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));
 
@@ -135745,7 +148857,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));
 
@@ -135771,7 +148887,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));
 
@@ -135802,7 +148922,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));
 
@@ -135929,7 +149053,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));
 
@@ -135960,7 +149088,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));
 
@@ -136116,7 +149248,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));
 
@@ -136143,13 +149279,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));
@@ -136176,9 +149316,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();
@@ -136195,7 +149334,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));
 
@@ -136219,7 +149362,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));
 
@@ -136244,7 +149391,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));
 
@@ -136268,7 +149419,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));
 
@@ -136297,7 +149452,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));
 
@@ -136434,8 +149593,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;
         }
 
@@ -136508,6 +149675,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.
@@ -136518,7 +149691,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;
@@ -136541,7 +149714,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));
 
@@ -136566,7 +149743,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));
 
@@ -136584,7 +149765,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));
 
@@ -136609,7 +149794,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));
 
@@ -136627,62 +149816,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);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            {
-                id actualValue = value;
-                VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast<uint32_t>(26)));
-                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
-                VerifyOrReturn(CheckValue("", actualValue[1], 1UL));
-                VerifyOrReturn(CheckValue("", actualValue[2], 2UL));
-                VerifyOrReturn(CheckValue("", actualValue[3], 3UL));
-                VerifyOrReturn(CheckValue("", actualValue[4], 4UL));
-                VerifyOrReturn(CheckValue("", actualValue[5], 5UL));
-                VerifyOrReturn(CheckValue("", actualValue[6], 6UL));
-                VerifyOrReturn(CheckValue("", actualValue[7], 7UL));
-                VerifyOrReturn(CheckValue("", actualValue[8], 8UL));
-                VerifyOrReturn(CheckValue("", actualValue[9], 9UL));
-                VerifyOrReturn(CheckValue("", actualValue[10], 10UL));
-                VerifyOrReturn(CheckValue("", actualValue[11], 11UL));
-                VerifyOrReturn(CheckValue("", actualValue[12], 12UL));
-                VerifyOrReturn(CheckValue("", actualValue[13], 13UL));
-                VerifyOrReturn(CheckValue("", actualValue[14], 14UL));
-                VerifyOrReturn(CheckValue("", actualValue[15], 15UL));
-                VerifyOrReturn(CheckValue("", actualValue[16], 16UL));
-                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));
+            if (err != nil) {
+                NSLog(@"Read AttributeList value: Error: %@", err);
+            } else {
+                NSLog(@"Read AttributeList value: Success");
             }
 
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestReadAttributeListValue_6()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read AttributeList value Error: %@", err);
-
             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>(28)));
                 VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
                 VerifyOrReturn(CheckValue("", actualValue[1], 1UL));
                 VerifyOrReturn(CheckValue("", actualValue[2], 2UL));
@@ -136703,11 +149847,68 @@ 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], 65530UL));
+                VerifyOrReturn(CheckValue("", actualValue[25], 65531UL));
+                VerifyOrReturn(CheckValue("", actualValue[26], 65532UL));
+                VerifyOrReturn(CheckValue("", actualValue[27], 65533UL));
+            }
+
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestReadAttributeListValue_6()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable 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>(27)));
+                VerifyOrReturn(CheckValue("", actualValue[0], 0UL));
+                VerifyOrReturn(CheckValue("", actualValue[1], 1UL));
+                VerifyOrReturn(CheckValue("", actualValue[2], 2UL));
+                VerifyOrReturn(CheckValue("", actualValue[3], 3UL));
+                VerifyOrReturn(CheckValue("", actualValue[4], 4UL));
+                VerifyOrReturn(CheckValue("", actualValue[5], 5UL));
+                VerifyOrReturn(CheckValue("", actualValue[6], 6UL));
+                VerifyOrReturn(CheckValue("", actualValue[7], 7UL));
+                VerifyOrReturn(CheckValue("", actualValue[8], 8UL));
+                VerifyOrReturn(CheckValue("", actualValue[9], 9UL));
+                VerifyOrReturn(CheckValue("", actualValue[10], 10UL));
+                VerifyOrReturn(CheckValue("", actualValue[11], 11UL));
+                VerifyOrReturn(CheckValue("", actualValue[12], 12UL));
+                VerifyOrReturn(CheckValue("", actualValue[13], 13UL));
+                VerifyOrReturn(CheckValue("", actualValue[14], 14UL));
+                VerifyOrReturn(CheckValue("", actualValue[15], 15UL));
+                VerifyOrReturn(CheckValue("", actualValue[16], 16UL));
+                VerifyOrReturn(CheckValue("", actualValue[17], 18UL));
+                VerifyOrReturn(CheckValue("", actualValue[18], 19UL));
+                VerifyOrReturn(CheckValue("", actualValue[19], 20UL));
+                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();
@@ -136724,7 +149925,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));
 
@@ -136749,7 +149954,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));
 
@@ -136767,7 +149976,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));
 
@@ -136790,7 +150003,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));
 
@@ -136816,7 +150033,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));
 
@@ -136834,7 +150055,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));
 
@@ -136872,7 +150097,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));
 
@@ -136897,7 +150126,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));
 
@@ -136915,7 +150148,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));
 
@@ -136941,7 +150178,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));
 
@@ -136951,7 +150192,7 @@ class TestBasicInformation : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheProductApppearanceValue_19()
+    CHIP_ERROR TestReadTheProductAppearanceValue_19()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -136959,7 +150200,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));
 
@@ -136975,6 +150220,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 {
@@ -137128,7 +150427,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));
 
@@ -137153,7 +150456,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));
 
@@ -137181,7 +150488,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));
 
@@ -137220,7 +150531,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));
 
@@ -137250,7 +150565,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
@@ -137277,7 +150596,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));
 
@@ -137659,7 +150982,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));
 
@@ -137677,7 +151004,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));
 
@@ -137703,7 +151034,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));
 
@@ -137721,7 +151056,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));
 
@@ -137759,7 +151098,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));
 
@@ -137785,7 +151128,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));
 
@@ -137803,7 +151150,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));
 
@@ -137827,7 +151178,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));
 
@@ -137850,7 +151205,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));
 
@@ -137877,7 +151236,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));
 
@@ -137901,7 +151264,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));
 
@@ -137924,7 +151291,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));
 
@@ -137950,7 +151321,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));
 
@@ -137991,7 +151366,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));
 
@@ -138014,7 +151393,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));
 
@@ -138043,7 +151426,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));
 
@@ -138066,7 +151453,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));
 
@@ -138090,7 +151481,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));
 
@@ -138113,7 +151508,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));
 
@@ -138137,7 +151536,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));
 
@@ -138160,7 +151563,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));
 
@@ -138189,7 +151596,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));
 
@@ -138212,7 +151623,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));
 
@@ -138241,7 +151656,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));
 
@@ -138264,7 +151683,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));
 
@@ -138287,7 +151710,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));
 
@@ -138307,7 +151734,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));
 
@@ -138330,7 +151761,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));
 
@@ -138363,7 +151798,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();
@@ -138380,7 +151819,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));
 
@@ -138410,7 +151853,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();
@@ -138427,7 +151874,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));
 
@@ -138457,7 +151908,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));
 
@@ -138485,7 +151940,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));
 
@@ -138516,7 +151975,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));
 
@@ -138629,7 +152092,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));
 
@@ -138780,7 +152247,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));
 
@@ -138801,7 +152272,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));
 
@@ -138823,7 +152298,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));
 
@@ -138851,7 +152330,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));
 
@@ -138876,7 +152359,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));
 
@@ -138904,7 +152391,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));
 
@@ -138934,7 +152425,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));
 
@@ -139260,7 +152755,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));
 
@@ -139283,7 +152782,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));
 
@@ -139307,7 +152810,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));
 
@@ -139345,7 +152852,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));
 
@@ -139368,7 +152879,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));
 
@@ -139392,7 +152907,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));
 
@@ -139419,7 +152938,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));
 
@@ -139438,7 +152961,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));
 
@@ -139468,7 +152995,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();
@@ -139486,7 +153017,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));
 
@@ -139505,7 +153040,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));
 
@@ -139523,7 +153062,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));
 
@@ -139549,7 +153092,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();
@@ -139569,7 +153116,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));
 
@@ -139588,7 +153139,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));
 
@@ -139616,7 +153171,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));
 
@@ -139635,7 +153194,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));
 
@@ -139653,7 +153216,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));
 
@@ -139679,7 +153246,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();
@@ -139699,7 +153270,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));
 
@@ -139717,7 +153292,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));
 
@@ -139745,7 +153324,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));
 
@@ -139766,7 +153349,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));
 
@@ -139787,7 +153374,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));
 
@@ -139820,7 +153411,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));
 
@@ -139845,7 +153440,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));
 
@@ -139878,7 +153477,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));
 
@@ -140027,7 +153630,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));
 
@@ -140053,7 +153660,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));
 
@@ -140080,7 +153691,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));
 
@@ -140098,7 +153713,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));
 
@@ -140125,7 +153744,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();
@@ -140142,7 +153765,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));
 
@@ -140270,7 +153897,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));
 
@@ -140295,7 +153926,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));
 
@@ -140323,7 +153958,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));
 
@@ -140986,7 +154625,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));
 
@@ -141006,7 +154649,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));
 
@@ -141050,7 +154697,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();
@@ -141096,7 +154747,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));
 
@@ -141116,7 +154771,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));
 
@@ -141161,7 +154820,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));
 
@@ -141181,7 +154844,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));
 
@@ -141209,7 +154876,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));
 
@@ -141356,7 +155027,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();
@@ -141534,7 +155209,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));
 
@@ -141552,7 +155231,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));
 
@@ -141588,7 +155271,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));
 
@@ -141606,7 +155293,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));
 
@@ -141650,7 +155341,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));
 
@@ -141683,7 +155378,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));
 
@@ -141821,7 +155520,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();
@@ -141847,7 +155550,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();
@@ -142011,7 +155718,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));
 
@@ -142043,7 +155754,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));
 
@@ -142066,7 +155781,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));
 
@@ -142093,7 +155812,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();
@@ -142120,7 +155843,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();
@@ -142141,7 +155868,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();
@@ -142162,7 +155893,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();
@@ -142420,7 +156155,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));
 
@@ -142438,7 +156177,11 @@ 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);
+            if (err != nil) {
+                NSLog(@"Read back fan mode: Error: %@", err);
+            } else {
+                NSLog(@"Read back fan mode: Success");
+            }
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -142464,7 +156207,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));
 
@@ -142482,7 +156229,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));
 
@@ -142506,7 +156257,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));
 
@@ -142530,7 +156285,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));
 
@@ -142555,7 +156314,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));
 
@@ -142573,7 +156336,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));
 
@@ -142600,7 +156367,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));
 
@@ -142618,7 +156389,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));
 
@@ -142642,7 +156417,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));
 
@@ -142666,7 +156445,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));
 
@@ -142691,7 +156474,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));
 
@@ -142709,7 +156496,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));
 
@@ -142736,7 +156527,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));
 
@@ -142754,7 +156549,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));
 
@@ -142778,7 +156577,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));
 
@@ -142801,7 +156604,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));
 
@@ -142825,7 +156632,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));
 
@@ -142851,7 +156662,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));
 
@@ -142869,7 +156684,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));
 
@@ -142892,7 +156711,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));
 
@@ -143102,7 +156925,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();
@@ -143152,7 +156979,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();
@@ -143202,7 +157033,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();
@@ -143254,7 +157089,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();
@@ -143309,7 +157148,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();
@@ -143366,7 +157209,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();
@@ -143413,7 +157260,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();
@@ -143465,7 +157316,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();
@@ -143517,7 +157372,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();
@@ -143569,7 +157428,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();
@@ -143904,7 +157767,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));
 
@@ -143930,7 +157797,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));
 
@@ -143957,7 +157828,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));
 
@@ -143983,7 +157858,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));
 
@@ -144009,7 +157888,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));
 
@@ -144035,7 +157918,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));
 
@@ -144059,7 +157946,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));
 
@@ -144083,7 +157974,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));
 
@@ -144101,7 +157996,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));
 
@@ -144132,7 +158031,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));
 
@@ -144157,7 +158060,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));
 
@@ -144175,7 +158082,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));
 
@@ -144206,7 +158117,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));
 
@@ -144240,7 +158155,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));
 
@@ -144266,7 +158185,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));
 
@@ -144292,7 +158215,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));
 
@@ -144318,7 +158245,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));
 
@@ -144342,7 +158273,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));
 
@@ -144360,7 +158295,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));
 
@@ -144391,7 +158330,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));
 
@@ -144416,7 +158359,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));
 
@@ -144434,7 +158381,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));
 
@@ -144465,7 +158416,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));
 
@@ -144769,7 +158724,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));
 
@@ -144791,7 +158750,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));
 
@@ -144814,7 +158777,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));
 
@@ -144837,7 +158804,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));
 
@@ -144864,7 +158835,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));
 
@@ -144882,7 +158857,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));
 
@@ -144905,7 +158884,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));
 
@@ -144933,7 +158916,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));
 
@@ -144956,7 +158943,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));
 
@@ -144974,7 +158965,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));
 
@@ -144997,7 +158992,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));
 
@@ -145020,7 +159019,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));
 
@@ -145047,7 +159050,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));
 
@@ -145082,7 +159089,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));
 
@@ -145105,7 +159116,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));
 
@@ -145128,7 +159143,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));
 
@@ -145152,7 +159171,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));
 
@@ -145178,7 +159201,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));
 
@@ -145196,7 +159223,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));
 
@@ -145219,7 +159250,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));
 
@@ -145248,7 +159283,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));
 
@@ -145277,7 +159316,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));
 
@@ -145295,7 +159338,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));
 
@@ -145318,7 +159365,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));
 
@@ -145341,7 +159392,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));
 
@@ -145606,7 +159661,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));
 
@@ -145645,7 +159704,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));
 
@@ -145681,7 +159744,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));
 
@@ -145717,7 +159784,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));
 
@@ -145753,7 +159824,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));
 
@@ -145790,7 +159865,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));
 
@@ -145822,7 +159901,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));
 
@@ -145854,7 +159937,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));
 
@@ -145904,7 +159991,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));
 
@@ -145942,7 +160033,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));
 
@@ -145962,7 +160057,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));
 
@@ -145994,7 +160093,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));
 
@@ -146028,7 +160131,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));
 
@@ -146050,7 +160157,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));
 
@@ -146292,7 +160403,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));
 
@@ -146330,7 +160445,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));
 
@@ -146353,7 +160472,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));
 
@@ -146391,7 +160514,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));
 
@@ -146414,7 +160541,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));
 
@@ -146452,7 +160583,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();
@@ -146482,7 +160617,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();
@@ -146519,7 +160658,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();
@@ -146563,7 +160706,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();
@@ -146586,7 +160733,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));
 
@@ -146609,7 +160760,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));
 
@@ -146634,7 +160789,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));
 
@@ -146671,7 +160830,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));
 
@@ -146695,7 +160858,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));
 
@@ -146733,7 +160900,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();
@@ -146771,7 +160942,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();
@@ -146809,7 +160984,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));
 
@@ -146827,7 +161006,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));
 
@@ -146871,7 +161054,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();
@@ -146917,7 +161104,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();
@@ -147116,7 +161307,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));
 
@@ -147139,7 +161334,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));
 
@@ -147162,7 +161361,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));
 
@@ -147185,7 +161388,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));
 
@@ -147212,7 +161419,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));
 
@@ -147235,7 +161446,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));
 
@@ -147259,7 +161474,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));
 
@@ -147282,7 +161501,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));
 
@@ -147306,7 +161529,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));
 
@@ -147329,7 +161556,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));
 
@@ -147353,7 +161584,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));
 
@@ -147376,7 +161611,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));
 
@@ -147400,7 +161639,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));
 
@@ -147423,7 +161666,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));
 
@@ -147628,7 +161875,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));
 
@@ -147651,7 +161902,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));
 
@@ -147674,7 +161929,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));
 
@@ -147697,7 +161956,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));
 
@@ -147727,7 +161990,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));
 
@@ -147750,7 +162017,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));
 
@@ -147774,7 +162045,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();
@@ -147791,7 +162066,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));
 
@@ -147815,7 +162094,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));
 
@@ -147838,7 +162121,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));
 
@@ -147862,7 +162149,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));
 
@@ -147885,7 +162176,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));
 
@@ -147909,7 +162204,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();
@@ -147926,7 +162225,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));
 
@@ -148180,7 +162483,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));
 
@@ -148203,7 +162510,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));
 
@@ -148226,7 +162537,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));
 
@@ -148249,7 +162564,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));
 
@@ -148272,7 +162591,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));
 
@@ -148295,7 +162618,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));
 
@@ -148313,7 +162640,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));
 
@@ -148336,7 +162667,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));
 
@@ -148359,7 +162694,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));
 
@@ -148386,7 +162725,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();
@@ -148403,7 +162746,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));
 
@@ -148426,7 +162773,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));
 
@@ -148449,7 +162800,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));
 
@@ -148476,7 +162831,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();
@@ -148493,7 +162852,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));
 
@@ -148516,7 +162879,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));
 
@@ -148539,7 +162906,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));
 
@@ -148566,7 +162937,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));
 
@@ -148584,7 +162959,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));
 
@@ -148607,7 +162986,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));
 
@@ -148630,7 +163013,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));
 
@@ -148893,7 +163280,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));
 
@@ -148922,7 +163313,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));
 
@@ -148947,7 +163342,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));
 
@@ -148969,7 +163368,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));
 
@@ -149008,7 +163411,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));
 
@@ -149044,7 +163451,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));
 
@@ -149072,7 +163483,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));
 
@@ -149090,7 +163505,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));
 
@@ -149113,7 +163532,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));
 
@@ -149361,7 +163784,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));
 
@@ -149385,7 +163812,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));
 
@@ -149409,7 +163840,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));
 
@@ -149428,7 +163863,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));
 
@@ -149454,7 +163893,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));
 
@@ -149479,7 +163922,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));
 
@@ -149500,7 +163947,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));
 
@@ -149521,7 +163972,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));
 
@@ -149542,7 +163997,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));
 
@@ -149563,7 +164022,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));
 
@@ -149584,7 +164047,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));
 
@@ -149608,7 +164075,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));
 
@@ -149766,7 +164237,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));
 
@@ -149788,7 +164263,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));
 
@@ -149822,7 +164301,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
@@ -149846,7 +164329,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));
 
@@ -149865,7 +164352,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));
 
@@ -149889,7 +164380,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));
 
@@ -149908,7 +164403,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));
 
@@ -150151,7 +164650,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));
 
@@ -150177,7 +164680,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));
 
@@ -150211,7 +164718,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
@@ -150238,7 +164749,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));
 
@@ -150257,7 +164772,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));
 
@@ -150281,7 +164800,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));
 
@@ -150300,7 +164823,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));
 
@@ -150327,7 +164854,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));
 
@@ -150361,7 +164892,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
@@ -150388,7 +164923,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));
 
@@ -150407,7 +164946,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));
 
@@ -150432,7 +164975,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));
 
@@ -150451,7 +164998,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));
 
@@ -150478,7 +165029,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));
 
@@ -150512,7 +165067,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
@@ -150539,7 +165098,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));
 
@@ -150558,7 +165121,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));
 
@@ -150587,7 +165154,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));
 
@@ -150606,7 +165177,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));
 
@@ -151606,7 +166181,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));
 
@@ -151675,7 +166254,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));
 
@@ -151705,7 +166288,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();
@@ -151726,7 +166313,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();
@@ -151754,7 +166345,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));
 
@@ -151776,7 +166371,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));
 
@@ -151862,7 +166461,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();
@@ -151890,7 +166493,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));
 
@@ -151912,7 +166519,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));
 
@@ -151999,7 +166610,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));
 
@@ -152021,7 +166636,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));
 
@@ -152109,7 +166728,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));
 
@@ -152131,7 +166754,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));
 
@@ -152219,7 +166846,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));
 
@@ -152241,7 +166872,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));
 
@@ -152329,7 +166964,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));
 
@@ -152351,7 +166990,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));
 
@@ -152442,7 +167085,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));
 
@@ -152464,7 +167111,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));
 
@@ -152555,7 +167206,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));
 
@@ -152577,7 +167232,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));
 
@@ -152666,7 +167325,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();
@@ -152687,7 +167350,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));
 
@@ -152768,7 +167435,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();
@@ -152789,7 +167460,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));
 
@@ -152870,7 +167545,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));
 
@@ -152892,7 +167571,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));
 
@@ -152979,7 +167662,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));
 
@@ -153001,7 +167688,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));
 
@@ -153087,7 +167778,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();
@@ -153115,7 +167810,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();
@@ -153136,7 +167835,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));
 
@@ -153158,7 +167861,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));
 
@@ -153238,7 +167945,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));
 
@@ -153260,7 +167971,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));
 
@@ -153340,7 +168055,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();
@@ -153361,7 +168080,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();
@@ -153382,7 +168105,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));
 
@@ -153404,7 +168131,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));
 
@@ -153476,7 +168207,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));
 
@@ -153545,7 +168280,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));
 
@@ -153579,7 +168318,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));
 
@@ -153630,7 +168373,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));
 
@@ -153681,7 +168428,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));
 
@@ -153740,7 +168491,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));
 
@@ -153790,7 +168545,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));
 
@@ -153839,7 +168598,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));
 
@@ -153878,7 +168641,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));
 
@@ -153963,7 +168730,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));
 
@@ -154024,7 +168795,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));
 
@@ -154073,7 +168848,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));
 
@@ -154107,7 +168886,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));
 
@@ -154141,7 +168924,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));
 
@@ -154192,7 +168979,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));
 
@@ -154243,7 +169034,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));
 
@@ -154303,7 +169098,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));
 
@@ -154354,7 +169153,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));
 
@@ -154406,7 +169209,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));
 
@@ -154456,7 +169263,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));
 
@@ -154494,7 +169305,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));
 
@@ -154581,7 +169396,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));
 
@@ -154642,7 +169461,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));
 
@@ -154691,7 +169514,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));
 
@@ -154740,7 +169567,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));
 
@@ -154790,7 +169621,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));
 
@@ -154840,7 +169675,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));
 
@@ -154890,7 +169729,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));
 
@@ -154940,7 +169783,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));
 
@@ -154991,7 +169838,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));
 
@@ -155041,7 +169892,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));
 
@@ -155090,7 +169945,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));
 
@@ -155139,7 +169998,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));
 
@@ -155190,7 +170053,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));
 
@@ -155241,7 +170108,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));
 
@@ -155293,7 +170164,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));
 
@@ -155343,7 +170218,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));
 
@@ -155392,7 +170271,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));
 
@@ -155442,7 +170325,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));
 
@@ -155492,7 +170379,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 +170421,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));
 
@@ -155628,7 +170523,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));
 
@@ -155666,7 +170565,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));
 
@@ -155758,7 +170661,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));
 
@@ -155784,7 +170691,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));
 
@@ -155832,7 +170743,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));
 
@@ -155922,7 +170837,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));
 
@@ -155948,7 +170867,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));
 
@@ -155996,7 +170919,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));
 
@@ -156079,7 +171006,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));
 
@@ -156122,7 +171053,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));
 
@@ -156148,7 +171083,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));
 
@@ -156199,7 +171138,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));
 
@@ -156250,7 +171193,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));
 
@@ -156297,7 +171244,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));
 
@@ -156378,7 +171329,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));
 
@@ -156461,7 +171416,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));
 
@@ -156511,7 +171470,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));
 
@@ -156561,7 +171524,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));
 
@@ -156599,7 +171566,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));
 
@@ -156625,7 +171596,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));
 
@@ -156676,7 +171651,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));
 
@@ -156727,7 +171706,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));
 
@@ -156774,7 +171757,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));
 
@@ -156846,7 +171833,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));
 
@@ -156918,7 +171909,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));
 
@@ -156990,7 +171985,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));
 
@@ -157073,7 +172072,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));
 
@@ -157121,7 +172124,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));
 
@@ -157159,7 +172166,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));
 
@@ -157244,7 +172255,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));
 
@@ -157305,7 +172320,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));
 
@@ -157346,7 +172365,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();
@@ -157371,7 +172394,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();
@@ -157396,7 +172423,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();
@@ -157421,7 +172452,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();
@@ -157446,7 +172481,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();
@@ -157471,7 +172510,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();
@@ -157492,7 +172535,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));
 
@@ -157514,7 +172561,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));
 
@@ -157590,7 +172641,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));
 
@@ -157648,7 +172703,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));
 
@@ -157699,7 +172758,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));
 
@@ -157749,7 +172812,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));
 
@@ -157799,7 +172866,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));
 
@@ -157849,7 +172920,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));
 
@@ -157899,7 +172974,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));
 
@@ -157937,7 +173016,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));
 
@@ -158936,7 +174019,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));
 
@@ -158972,7 +174059,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));
 
@@ -158999,7 +174090,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));
 
@@ -159026,7 +174121,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));
 
@@ -159053,7 +174152,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));
 
@@ -159095,7 +174198,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();
@@ -159128,7 +174235,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();
@@ -159161,7 +174272,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();
@@ -159194,7 +174309,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();
@@ -159227,7 +174346,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();
@@ -159260,7 +174383,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();
@@ -159293,7 +174420,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();
@@ -159326,7 +174457,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();
@@ -159359,7 +174494,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();
@@ -159392,7 +174531,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();
@@ -159425,7 +174568,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();
@@ -159458,7 +174605,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();
@@ -159491,7 +174642,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();
@@ -159524,7 +174679,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();
@@ -159547,7 +174706,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));
 
@@ -159586,7 +174749,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));
 
@@ -159625,7 +174792,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));
 
@@ -159664,7 +174835,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));
 
@@ -159703,7 +174878,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));
 
@@ -159742,7 +174921,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));
 
@@ -159785,7 +174968,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();
@@ -159812,7 +174999,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();
@@ -159839,7 +175030,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();
@@ -159866,7 +175061,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();
@@ -159893,7 +175092,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();
@@ -159920,7 +175123,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();
@@ -159943,7 +175150,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));
 
@@ -159982,7 +175193,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));
 
@@ -160021,7 +175236,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));
 
@@ -160060,7 +175279,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));
 
@@ -160099,7 +175322,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));
 
@@ -160138,7 +175365,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));
 
@@ -160181,7 +175412,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();
@@ -160208,7 +175443,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();
@@ -160235,7 +175474,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();
@@ -160262,7 +175505,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();
@@ -160283,7 +175530,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));
 
@@ -160315,7 +175566,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));
 
@@ -160347,7 +175602,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));
 
@@ -160385,7 +175644,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));
 
@@ -160407,7 +175670,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));
 
@@ -160466,7 +175733,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));
 
@@ -160490,7 +175761,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));
 
@@ -160558,7 +175833,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));
 
@@ -160582,7 +175861,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));
 
@@ -160631,7 +175914,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();
@@ -160654,7 +175941,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();
@@ -160677,7 +175968,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();
@@ -160700,7 +175995,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();
@@ -160723,7 +176022,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();
@@ -160746,7 +176049,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));
 
@@ -160810,7 +176117,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));
 
@@ -160857,7 +176168,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));
 
@@ -160906,7 +176221,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();
@@ -160929,7 +176248,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();
@@ -160952,7 +176275,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();
@@ -160975,7 +176302,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();
@@ -160998,7 +176329,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();
@@ -161021,7 +176356,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));
 
@@ -161085,7 +176424,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));
 
@@ -161132,7 +176475,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));
 
@@ -161179,7 +176526,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();
@@ -161200,7 +176551,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();
@@ -161223,7 +176578,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));
 
@@ -161287,7 +176646,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));
 
@@ -161334,7 +176697,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));
 
@@ -161393,7 +176760,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));
 
@@ -161417,7 +176788,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));
 
@@ -161485,7 +176860,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));
 
@@ -161509,7 +176888,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));
 
@@ -161562,7 +176945,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));
 
@@ -161584,7 +176971,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));
 
@@ -161633,7 +177024,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));
 
@@ -161657,7 +177052,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));
 
@@ -161696,7 +177095,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));
 
@@ -161720,7 +177123,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));
 
@@ -161759,7 +177166,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));
 
@@ -161808,7 +177219,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));
 
@@ -161855,7 +177270,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));
 
@@ -161902,7 +177321,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));
 
@@ -161961,7 +177384,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));
 
@@ -161985,7 +177412,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));
 
@@ -162009,7 +177440,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));
 
@@ -162048,7 +177483,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));
 
@@ -162072,7 +177511,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));
 
@@ -162111,7 +177554,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));
 
@@ -162175,7 +177622,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));
 
@@ -162204,7 +177655,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));
 
@@ -162238,7 +177693,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));
 
@@ -162262,7 +177721,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));
 
@@ -162330,7 +177793,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));
 
@@ -162354,7 +177821,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));
 
@@ -162413,7 +177884,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));
 
@@ -162437,7 +177912,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));
 
@@ -162505,7 +177984,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));
 
@@ -162529,7 +178012,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));
 
@@ -162576,7 +178063,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));
 
@@ -162600,7 +178091,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));
 
@@ -162639,7 +178134,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));
 
@@ -162678,7 +178177,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));
 
@@ -162717,7 +178220,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));
 
@@ -162754,7 +178261,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));
 
@@ -162801,7 +178312,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));
 
@@ -162854,7 +178369,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));
 
@@ -162876,7 +178395,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));
 
@@ -162934,7 +178457,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));
 
@@ -162985,7 +178512,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));
 
@@ -163013,7 +178544,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));
 
@@ -163035,7 +178570,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));
 
@@ -163057,7 +178596,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));
 
@@ -163104,7 +178647,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));
 
@@ -163136,7 +178683,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));
 
@@ -163185,7 +178736,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));
 
@@ -163249,7 +178804,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));
 
@@ -163296,7 +178855,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));
 
@@ -163318,7 +178881,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));
 
@@ -163350,7 +178917,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));
 
@@ -163382,7 +178953,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));
 
@@ -163416,7 +178991,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));
 
@@ -163480,7 +179059,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));
 
@@ -163527,7 +179110,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));
 
@@ -164149,7 +179736,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));
 
@@ -164173,7 +179764,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));
 
@@ -164197,7 +179792,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));
 
@@ -164216,7 +179815,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));
 
@@ -164235,7 +179838,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));
 
@@ -164254,7 +179861,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));
 
@@ -164273,7 +179884,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));
 
@@ -164292,7 +179907,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));
 
@@ -164311,7 +179930,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));
 
@@ -164330,7 +179953,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));
 
@@ -164349,7 +179976,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));
 
@@ -164368,7 +179999,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));
 
@@ -164387,7 +180022,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));
 
@@ -164406,7 +180045,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));
 
@@ -164437,7 +180080,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));
 
@@ -164467,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 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));
 
@@ -164488,7 +180139,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));
 
@@ -164511,7 +180166,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));
 
@@ -164534,7 +180193,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));
 
@@ -164557,7 +180220,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));
 
@@ -164578,7 +180245,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));
 
@@ -164599,7 +180270,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));
 
@@ -164620,7 +180295,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));
 
@@ -164642,7 +180321,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));
 
@@ -164663,7 +180346,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));
 
@@ -164684,7 +180371,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));
 
@@ -164705,7 +180396,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));
 
@@ -164726,7 +180421,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));
 
@@ -164747,7 +180446,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));
 
@@ -164768,7 +180471,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));
 
@@ -164789,7 +180496,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));
 
@@ -164810,7 +180521,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));
 
@@ -164831,7 +180546,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));
 
@@ -164852,7 +180571,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));
 
@@ -164873,7 +180596,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));
 
@@ -164895,7 +180622,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));
 
@@ -164918,7 +180649,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));
 
@@ -164941,7 +180676,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));
 
@@ -164964,7 +180703,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));
 
@@ -164985,7 +180728,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));
 
@@ -165011,7 +180758,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));
 
@@ -165032,7 +180783,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));
 
@@ -165053,7 +180808,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));
 
@@ -165074,7 +180833,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));
 
@@ -165095,7 +180858,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));
 
@@ -165393,7 +181160,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));
 
@@ -165415,7 +181186,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));
 
@@ -165507,7 +181282,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));
 
@@ -165549,7 +181328,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));
 
@@ -165598,7 +181381,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));
 
@@ -165619,7 +181406,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));
 
@@ -165640,7 +181431,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();
@@ -165660,7 +181455,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();
@@ -165683,7 +181482,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));
 
@@ -165707,7 +181510,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));
 
@@ -165729,7 +181536,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));
 
@@ -165763,7 +181574,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));
 
@@ -165791,7 +181606,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));
 
@@ -165817,7 +181636,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));
 
@@ -166054,7 +181877,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));
 
@@ -166076,7 +181903,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));
 
@@ -166153,7 +181984,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));
 
@@ -166178,7 +182013,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));
 
@@ -166218,7 +182057,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));
 
@@ -166242,7 +182085,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));
 
@@ -166318,7 +182165,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();
@@ -166341,7 +182192,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));
 
@@ -166400,7 +182255,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));
 
@@ -166459,7 +182318,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));
 
@@ -166483,7 +182346,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));
 
@@ -166540,7 +182407,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));
 
@@ -166738,7 +182609,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));
 
@@ -166772,7 +182647,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));
 
@@ -166794,7 +182673,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));
 
@@ -166852,7 +182735,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();
@@ -166873,7 +182760,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));
 
@@ -166905,7 +182796,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));
 
@@ -166937,7 +182832,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));
 
@@ -166959,7 +182858,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));
 
@@ -166991,7 +182894,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));
 
@@ -167297,7 +183204,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));
 
@@ -167319,7 +183230,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));
 
@@ -167396,7 +183311,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));
 
@@ -167421,7 +183340,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));
 
@@ -167455,7 +183378,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));
 
@@ -167479,7 +183406,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));
 
@@ -167537,7 +183468,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();
@@ -167560,7 +183495,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));
 
@@ -167616,7 +183555,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));
 
@@ -167640,7 +183583,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));
 
@@ -167687,7 +183634,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));
 
@@ -167711,7 +183662,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));
 
@@ -167762,7 +183717,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));
 
@@ -167786,7 +183745,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));
 
@@ -167840,7 +183803,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));
 
@@ -167887,7 +183854,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();
@@ -167910,7 +183881,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));
 
@@ -167932,7 +183907,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));
 
@@ -167954,7 +183933,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));
 
@@ -168202,7 +184185,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));
 
@@ -168241,7 +184228,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));
 
@@ -168263,7 +184254,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));
 
@@ -168354,7 +184349,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();
@@ -168386,7 +184385,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();
@@ -168414,7 +184417,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));
 
@@ -168436,7 +184443,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));
 
@@ -168522,7 +184533,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));
 
@@ -168544,7 +184559,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));
 
@@ -168623,7 +184642,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));
 
@@ -168645,7 +184668,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));
 
@@ -168718,7 +184745,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));
 
@@ -168740,7 +184771,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));
 
@@ -169147,7 +185182,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));
 
@@ -169169,7 +185208,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));
 
@@ -169245,7 +185288,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));
 
@@ -169266,7 +185313,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));
 
@@ -169287,7 +185338,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));
 
@@ -169308,7 +185363,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));
 
@@ -169329,7 +185388,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));
 
@@ -169365,7 +185428,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));
 
@@ -169414,7 +185481,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));
 
@@ -169463,7 +185534,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));
 
@@ -169505,7 +185580,11 @@ 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);
+                                                              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));
 
@@ -169560,7 +185639,11 @@ class Test_TC_DRLK_2_11 : public TestCommandBridge {
 
         [cluster getCredentialStatusWithParams:params completion:
                                                           ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable err) {
-                                                              NSLog(@"Step 3b: TH sends Get Credential Status Command with type RFID Error: %@", 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");
+                                                              }
 
                                                               VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
@@ -169615,7 +185698,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));
 
@@ -169670,7 +185757,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));
 
@@ -169696,7 +185787,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));
 
@@ -169751,7 +185846,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));
 
@@ -169806,7 +185905,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));
 
@@ -169832,7 +185935,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));
 
@@ -169887,7 +185994,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));
 
@@ -169913,7 +186024,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));
 
@@ -169964,7 +186079,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));
 
@@ -170015,7 +186134,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));
 
@@ -170335,7 +186458,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));
 
@@ -170367,7 +186494,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));
 
@@ -170400,7 +186531,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));
 
@@ -170448,7 +186583,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));
 
@@ -170487,7 +186626,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));
 
@@ -170510,7 +186653,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));
 
@@ -170543,7 +186690,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));
 
@@ -170575,7 +186726,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));
 
@@ -170612,7 +186767,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));
 
@@ -170646,7 +186805,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));
 
@@ -170680,7 +186843,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));
 
@@ -170712,7 +186879,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));
 
@@ -170749,7 +186920,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));
 
@@ -170781,7 +186956,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));
 
@@ -170818,7 +186997,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));
 
@@ -170863,7 +187046,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));
 
@@ -170896,7 +187083,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));
 
@@ -170928,7 +187119,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));
 
@@ -170960,7 +187155,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));
 
@@ -170992,7 +187191,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));
 
@@ -171029,7 +187232,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));
 
@@ -171071,7 +187278,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));
 
@@ -171101,7 +187312,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));
 
@@ -171123,7 +187338,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));
 
@@ -171155,7 +187374,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));
 
@@ -171187,7 +187410,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));
 
@@ -171231,7 +187458,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));
 
@@ -171396,14 +187627,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;
@@ -171411,21 +189233,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"));
@@ -171435,23 +189261,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();
         }];
@@ -171459,15 +189284,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));
 
@@ -171478,411 +189307,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");
@@ -171890,7 +189361,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));
 
@@ -171901,7 +189376,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");
@@ -171909,7 +189384,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));
 
@@ -171920,7 +189399,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");
@@ -171928,7 +189407,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));
 
@@ -171939,7 +189422,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");
@@ -171947,7 +189430,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));
 
@@ -171958,7 +189445,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");
@@ -171966,7 +189453,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));
 
@@ -171984,7 +189475,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");
@@ -171992,7 +189483,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));
 
@@ -172008,7 +189503,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");
@@ -172016,7 +189511,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));
 
@@ -172029,7 +189528,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");
@@ -172037,7 +189536,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));
 
@@ -172050,7 +189553,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");
@@ -172058,7 +189561,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));
 
@@ -172071,7 +189578,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");
@@ -172079,7 +189586,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));
 
@@ -172098,7 +189609,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");
@@ -172106,7 +189617,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));
 
@@ -172119,7 +189634,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");
@@ -172127,7 +189642,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));
 
@@ -172140,7 +189659,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");
@@ -172148,7 +189667,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));
 
@@ -172161,7 +189684,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");
@@ -172169,7 +189692,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));
 
@@ -172187,7 +189714,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");
@@ -172195,7 +189722,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));
 
@@ -172208,7 +189739,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");
@@ -172216,7 +189747,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));
 
@@ -172229,7 +189764,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");
@@ -172237,7 +189772,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));
 
@@ -172297,7 +189836,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;
             }
@@ -172305,7 +189844,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;
             }
@@ -172313,7 +189852,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;
             }
@@ -172321,7 +189860,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;
             }
@@ -172329,7 +189868,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;
             }
@@ -172360,12 +189899,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;
         }
 
@@ -172441,7 +189980,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));
 
@@ -172460,7 +190003,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));
 
@@ -172479,7 +190026,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));
 
@@ -172498,7 +190049,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));
 
@@ -172517,7 +190072,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));
 
@@ -172541,7 +190100,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));
 
@@ -172565,7 +190128,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));
 
@@ -172588,7 +190155,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));
 
@@ -172599,19 +190170,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();
         }];
 
@@ -173009,7 +190586,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));
 
@@ -173039,7 +190620,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));
 
@@ -173058,7 +190643,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));
 
@@ -173080,7 +190669,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));
 
@@ -173111,7 +190704,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));
 
@@ -173151,7 +190748,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));
 
@@ -173194,7 +190795,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));
 
@@ -173227,7 +190832,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));
 
@@ -173270,7 +190879,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));
 
@@ -173296,7 +190909,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));
 
@@ -173335,7 +190952,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));
 
@@ -173361,7 +190982,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));
 
@@ -173405,7 +191030,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));
 
@@ -173440,7 +191069,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));
 
@@ -173466,7 +191099,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));
 
@@ -173510,7 +191147,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));
 
@@ -173544,7 +191185,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));
 
@@ -173566,7 +191211,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));
 
@@ -173682,7 +191331,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));
 
@@ -173701,7 +191354,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));
 
@@ -173832,7 +191489,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));
 
@@ -173851,7 +191512,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));
 
@@ -174125,7 +191790,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));
 
@@ -174149,7 +191818,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));
 
@@ -174173,7 +191846,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));
 
@@ -174192,7 +191869,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));
 
@@ -174211,7 +191892,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));
 
@@ -174230,7 +191915,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));
 
@@ -174257,7 +191946,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));
 
@@ -174283,7 +191976,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));
 
@@ -174306,7 +192003,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));
 
@@ -174327,7 +192028,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));
 
@@ -174348,7 +192053,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));
 
@@ -174369,7 +192078,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));
 
@@ -174393,7 +192106,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));
 
@@ -174414,7 +192131,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));
 
@@ -174588,7 +192309,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));
 
@@ -174610,7 +192335,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));
 
@@ -174632,7 +192361,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));
 
@@ -174654,7 +192387,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));
 
@@ -174673,7 +192410,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));
 
@@ -174696,7 +192437,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));
 
@@ -174956,7 +192701,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));
 
@@ -174980,7 +192729,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));
 
@@ -175004,7 +192757,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));
 
@@ -175023,7 +192780,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));
 
@@ -175042,7 +192803,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));
 
@@ -175061,7 +192826,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));
 
@@ -175088,7 +192857,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));
 
@@ -175114,7 +192887,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));
 
@@ -175137,7 +192914,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));
 
@@ -175158,7 +192939,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));
 
@@ -175179,7 +192964,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));
 
@@ -175200,7 +192989,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));
 
@@ -175224,7 +193017,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));
 
@@ -175245,7 +193042,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));
 
@@ -175419,7 +193220,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));
 
@@ -175441,7 +193246,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));
 
@@ -175463,7 +193272,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));
 
@@ -175485,7 +193298,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));
 
@@ -175504,7 +193321,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));
 
@@ -175527,7 +193348,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));
 
@@ -175599,7 +193424,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>(),
@@ -175623,6 +193447,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>(),
@@ -175809,6 +193634,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>(),